implemented folder move.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@389 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-07-01 10:42:15 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2005-07-01 10:42:15 +0000
commit: 0ada6c15f7eef4e46d8f1b8964dad1193692a10a (patch)
tree: e767d7b49be640a123d3bf49ae751fa2af7ba441 /po
parent: 0839e124a6910f5d134ec3b229466cd470b0c7ea (diff)
28 files changed, 10890 insertions, 10475 deletions
diff --git a/po/bg.po b/po/bg.po
index 08054bfe..26839d46 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Изтриване на акаунт"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Да"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Не"
 
@@ -260,7 +260,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Файл"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
@@ -332,7 +332,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -341,12 +341,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
@@ -396,7 +396,7 @@ msgstr "Име:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -573,7 +573,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Папка"
 
@@ -648,7 +648,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Никой"
 
@@ -660,8 +660,8 @@ msgstr "/_Добавяне"
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
@@ -705,7 +705,7 @@ msgstr "/_Редактиране/_Отмяна"
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
@@ -714,7 +714,7 @@ msgstr "/_Редактиране/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
@@ -726,7 +726,7 @@ msgstr "/_Редактиране/_Вмъкване"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
@@ -743,7 +743,7 @@ msgstr "/_Редактиране/П_ренасяне на всички дълг�
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Изглед"
@@ -765,8 +765,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Изглед/---"
@@ -783,7 +783,7 @@ msgstr "/_Изглед/_Линия"
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
@@ -795,127 +795,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
@@ -923,13 +923,13 @@ msgstr "/_Инструменти/_Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
@@ -1013,7 +1013,7 @@ msgstr "Съставяне на съобщение%s"
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Изпращане"
@@ -1117,7 +1117,7 @@ msgstr "MIME тип"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Размер"
 
@@ -1448,12 +1448,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -1618,162 +1618,167 @@ msgstr "Желаете ли презаписване на съществуващ
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Създаване на _нова папка..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Преименуване на папка..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Изтриване на папка"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Търсене на съобщения..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Няма непрочетени съобщения."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Записване в новинарска група"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Премахване на новинарска група"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1783,16 +1788,21 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Папка `%s' не може да се премахне."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1803,24 +1813,24 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1829,34 +1839,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -1941,156 +1951,156 @@ msgstr "Създаване изглед на изображение...\n"
 msgid "Can't load the image."
 msgstr "Не може да се зареди изображението."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP директория на сървъра"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Не може да се стартира TLS сесия.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -2192,7 +2202,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Следващ"
 
@@ -2414,7 +2424,7 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2539,640 +2549,645 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Файл/_Папка/П_реименуване на папка..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Изглед/_Показване на заглавните части(headers)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3182,16 +3197,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3200,153 +3215,153 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3505,30 +3520,30 @@ msgstr ""
 "Невалиден команден ред за печат:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Не може да се отвори файлът с маркировките.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr ""
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3626,81 +3641,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командния ред за MIME преглед е невалиден: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "създаване на NNTP връзка до %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP връзката до %s:%d беше прекъсната. Свързване...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статия %d е вече кеширана.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "взимане на статия %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не може да се прочете статия %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "не може да се извлече списък на новинарска група\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "не може да се публикува статия.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не може да се извлече статия %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "не може да се избере група %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, fuzzy, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Невалиден обхват на статии: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "няма нови статии.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "получаване на xover %d - %d в %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "не може да се получи xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "грешка при получаването на xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невалиден xover ред: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "не може да се получи xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "грешка при получаването на xhdr.\n"
 
@@ -5462,17 +5477,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Дата"
 
@@ -6230,20 +6245,20 @@ msgstr "Изграждане на нишките..."
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "No."
 
diff --git a/po/cs.po b/po/cs.po
index a949bed9..c7ef0e89 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -135,14 +135,14 @@ msgid "Delete account"
 msgstr "Smazat účet"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ano"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ne"
 
@@ -259,7 +259,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Soubor"
@@ -281,9 +281,9 @@ msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
@@ -331,7 +331,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -340,12 +340,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -363,17 +363,17 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
@@ -395,7 +395,7 @@ msgstr "Jméno:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -570,7 +570,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Složka"
 
@@ -645,7 +645,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Žádná"
 
@@ -657,8 +657,8 @@ msgstr "/_Přidat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -702,7 +702,7 @@ msgstr "/Úp_ravy/_Zpět"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -711,7 +711,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
@@ -723,7 +723,7 @@ msgstr "/Úp_ravy/V_ložit"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
@@ -740,7 +740,7 @@ msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Z_obrazit"
@@ -762,8 +762,8 @@ msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
@@ -780,7 +780,7 @@ msgstr "/Z_obrazit/Praví_tko"
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
@@ -792,127 +792,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
@@ -920,13 +920,13 @@ msgstr "/_Nástroje/_Databáze adres"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1010,7 +1010,7 @@ msgstr "Psaní zprávy%s"
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Odeslat"
@@ -1114,7 +1114,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Délka"
 
@@ -1446,12 +1446,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -1616,163 +1616,168 @@ msgstr "Přepsat existující soubor?"
 msgid "failed to write configuration to file\n"
 msgstr "Selhání při zápisu konfigurace do souboru\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/_Vytvořit novou složku..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Přej_menovat složku..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Na_jít zprávy..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Při_hlásit diskusní skupinu..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusní skupinu"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Vytvářím náhled pro složku...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nová"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o složce...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1782,16 +1787,21 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Nemohu odstranit složku '%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1802,24 +1812,24 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1828,34 +1838,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -1940,160 +1950,160 @@ msgstr "Vytvářím náhled na obrázek...\n"
 msgid "Can't load the image."
 msgstr "Nemohu nahrát obrázek."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s:%d bylo rozpojeno. Obnovuji spojení...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "adresář pro IMAP server"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS sezení.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze nastavit příznak smazání: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze nastavit příznak smazané: 1: %d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označený soubor nebyl nalezen.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nemohu vytvořit '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "Nemohu načíst obálku\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Během načítání obálky se vyskytla chyba.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Nemohu analyzovat obálku: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "nemohu najít obálku\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentikace selhala."
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Nemohu přidat %s do %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(posílám soubor...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze přidat zprávu %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %d na %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže konvertovat %s na UTF-7\n"
@@ -2195,7 +2205,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Další"
 
@@ -2418,7 +2428,7 @@ msgstr "Zadejte heslo"
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2541,641 +2551,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odebrat _poštovní schránku"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Soubor/_Složka/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Soubor/_Složka/_Zkontrolovat nové zprávy ve všech složkách"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Soubor/_Importovat soubor mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Soubor/E_xportovat do mbox souboru..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/_Vyprázdnit koš"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/_Vložit soubor"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Soubor/_Konec"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Najít v aktuální zprávě..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Na_jít zprávy..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Ná_hled na zprávu"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nic"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné pro_hlédnutí zprávy"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/podle čí_sla"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/podle _velikosti"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/podle _data"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/podle _od koho"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/podle odesí_latele"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/podle př_edmětu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/podle _barevné značky"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/podle o_značení"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/podle ne_přečtených"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/podle připo_jených souborů"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/_Sbalit všechna vlákna"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/_Další zpráva"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 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:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Další nepřeč_tená zpráva"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Další n_ová zpráva"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Další oz_načená zpráva"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 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:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Z_obrazit/_Přejít/Da_lší zpráva s návěštím"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Autodetekce "
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonská (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit všechna zá_hlaví"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmout _ze všech účtů"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpráva/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_všem"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_odesílateli"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/do _diskusního listu"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtenou"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit _všechny jako přečtené"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/_Příjem nové pošty"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Přidat odesílatele do a_dresáře"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Od"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Komu"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/podle _Předmětu"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtr zpráv "
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/S_pustit"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamů "
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změna aktuálního účtu"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/_FAQ/_Německy"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/_FAQ/Š_panělsky"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/_FAQ/_Italsky"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Měním typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3185,16 +3200,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3204,153 +3219,153 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3509,30 +3524,30 @@ msgstr ""
 "Příkazová řádka pro tisk je neplatná:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nemohu zkopírovat zprávu %s do %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Nemohu otevřít označený soubor.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Poslední počet v adresáři %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3630,81 +3645,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Vytvářím NNTP spojení s %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojení %s:%d bylo přerušeno. Obnovuji spojení...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "příspěvek %d už byl v mezipaměti.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Získávám příspěvek %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Nemohu číst příspěvek %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "Nemohu načíst seznam diskuzních skupin\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "Nemohu odeslat příspěvek.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Nemohu načíst příspěvek %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "Nemohu vybrat skupinu: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah příspěvků: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "Žádný nový příspěvek.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "získávám xover %d - %d v %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "nelze získat xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "Během získávání xover se vyskytla chyba.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Neplatná xover řádka: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "nelze získat xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "Během získávání xhdr se vyskytla chyba .\n"
 
@@ -5466,17 +5481,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6236,20 +6251,20 @@ msgstr "Vytvářím vlákna..."
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Čís."
 
diff --git a/po/da.po b/po/da.po
index df0b5791..d6f5dba8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -134,14 +134,14 @@ msgid "Delete account"
 msgstr "Slet konto"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ja"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nej"
 
@@ -258,7 +258,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Filer"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
@@ -330,7 +330,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -339,12 +339,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Redigér"
 
@@ -394,7 +394,7 @@ msgstr "Navn:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -565,7 +565,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Mappe"
 
@@ -640,7 +640,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ingen"
 
@@ -652,8 +652,8 @@ msgstr "/_Tilføj..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -697,7 +697,7 @@ msgstr "/_Redigér/_Fortryd"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
@@ -706,7 +706,7 @@ msgstr "/_Redigér/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
@@ -718,7 +718,7 @@ msgstr "/_Redigér/_Sæt ind"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
@@ -735,7 +735,7 @@ msgstr "/_Redigér/Formater _alle lange linier"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vis"
@@ -757,8 +757,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Vis/---"
@@ -775,7 +775,7 @@ msgstr "/_Vis/_Linieal"
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
@@ -787,127 +787,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
@@ -915,13 +915,13 @@ msgstr "/_Funktioner/_Adressebog"
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
@@ -1005,7 +1005,7 @@ msgstr "Ny meddelelse%s"
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Send"
@@ -1109,7 +1109,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Størrelse"
 
@@ -1440,12 +1440,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -1610,163 +1610,168 @@ msgstr "Overskrive eksisterende fil?"
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Omdøb mappe..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Søg meddelelse..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ulæste meddelelser."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner på nyhedsgruppe..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1776,16 +1781,21 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Kan ikke slette mappe `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1796,24 +1806,24 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1822,34 +1832,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -1934,158 +1944,158 @@ msgstr "Opretter billed visning...\n"
 msgid "Can't load the image."
 msgstr "Kan ikke læse billede."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server sti."
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -2187,7 +2197,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Næste"
 
@@ -2414,7 +2424,7 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2537,641 +2547,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Filer/_Mappe/_Omdøb mappe..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3181,16 +3196,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3199,153 +3214,153 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3506,30 +3521,30 @@ msgstr ""
 "Udskriv kommando er ugyldig:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke åbne markéret fil.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Sidste nummer i sti %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3627,81 +3642,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME visnings kommando ugyldig: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "oprettet NNTP forbindelse til %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP forbindelse til %s:%d blev afbrudt. Genforbinder...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d er allerede gemt.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "modtager artikel %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann ikke læse artikel %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "kann ikke modtage nyhedsgruppe liste\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "kan ikke sende artikel.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan ikke modtage artikel %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan ikke vælge gruppe: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ugyldigt artikel område: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "ingen nye artikler.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "modtager XOVER %d - %d i %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "kan ikke modtage XOVER\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "fejl ved modtagelse af XOVER.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "kan ikke modtage XHDR\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "fejl ved modtagelse af XHDR.\n"
 
@@ -5461,17 +5476,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Dato"
 
@@ -6235,20 +6250,20 @@ msgstr "Opretter tråde"
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/de.po b/po/de.po
index 61351e0d..2b6b9554 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2005-02-08 22:49+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -139,14 +139,14 @@ msgid "Delete account"
 msgstr "Account löschen"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ja"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nein"
 
@@ -263,7 +263,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datei"
@@ -285,9 +285,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
@@ -335,7 +335,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -344,12 +344,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -367,17 +367,17 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
@@ -399,7 +399,7 @@ msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -577,7 +577,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Ablage"
 
@@ -652,7 +652,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Keine"
 
@@ -664,8 +664,8 @@ msgstr "/_Hinzufügen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -705,7 +705,7 @@ msgstr "/_Bearbeiten/_Zurück"
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
@@ -714,7 +714,7 @@ msgstr "/_Bearbeiten/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
@@ -726,7 +726,7 @@ msgstr "/_Bearbeiten/_Einfügen"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
@@ -742,7 +742,7 @@ msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ansicht"
@@ -764,8 +764,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
@@ -782,7 +782,7 @@ msgstr "/_Ansicht/_Lineal"
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
@@ -794,127 +794,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Central European (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
@@ -922,13 +922,13 @@ msgstr "/_Werkzeug/_Adressbuch"
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
@@ -1009,7 +1009,7 @@ msgstr "Verfasse Nachricht%s"
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Senden"
@@ -1113,7 +1113,7 @@ msgstr "MIME-Typ"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Größe"
 
@@ -1444,12 +1444,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -1614,160 +1614,165 @@ msgstr "Überschreibe existierende Datei?"
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage `%s' existiert bereits."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage `%s' nicht erstellen."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Ablage _umbenennen..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten prüfen"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in `%s' ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1777,16 +1782,21 @@ 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:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Kann Ablage `%s' nicht entfernen."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1797,24 +1807,24 @@ msgstr ""
 "Alle Ablagen und Nachrichten in `%s' werden gelöscht.\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage `%s' nicht entfernen."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1823,34 +1833,34 @@ msgstr ""
 "Mailbox `%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account `%s' wirklich löschen?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup `%s' wirklich löschen?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account `%s' wirklich löschen?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -1935,156 +1945,156 @@ msgstr "Erstelle Bilderansicht...\n"
 msgid "Can't load the image."
 msgstr "Kann das Bild nicht laden."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "kann nicht löschen\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schließen\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -2187,7 +2197,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Nächste"
 
@@ -2407,7 +2417,7 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2531,622 +2541,627 @@ msgstr ""
 "Ein frühere Konfiguration wurde gefunden.\n"
 "Soll sie migriert werden?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Datei/Ab_lage"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/Ab_lage/_Neue Ablage erstellen..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/Ab_lage/Ablage _löschen"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf neue Nachrichten _prüfen"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ablagen auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//_Datei/_Mailbox/Ablagebaum _erneuern"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Datei/_Ohne Verbindung arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/Thread au_swählen"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Aktuelle Nachricht durchsuchen..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Suche Nachrichten..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Zeigen oder Verstecken"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht//Zeigen oder Verstecken/Ablagebaum"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Nachrichtenansicht"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/Bilder _und Text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatikerkennung"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/_Zeige alle Kopfzeilen"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usführen"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Lösche alle Nachrichten in allen Papierkörben?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3156,16 +3171,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3174,150 +3189,150 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard-Account"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 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:2530
+#: src/mainwindow.c:2538
 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:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3478,30 +3493,30 @@ msgstr ""
 "Druck-Befehlszeile ist ungültig:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht öffnen.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3599,81 +3614,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME Betrachterbefehl ist ungültig: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-Verbindung mit %s:%d wurde aufgehoben. Erneut verbinden...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Artikel %d wurde schon zwischengespeichert.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "empfange Artikel %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kann Artikel %d nicht lesen\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "kann die Newsgroup-Liste nicht empfangen\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "kann Artikel nicht senden.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kann Artikel %d nicht empfangen\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kann die Gruppe: %s nicht wählen\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "Keine neuen Artikel.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme Newsübersicht %d - %d in %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "kann Newsübersicht nicht bekommen\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der Newsübersicht.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ungültige Newsübersichtszeile: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 
@@ -5408,17 +5423,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6191,20 +6206,20 @@ msgstr "Threads erstellen..."
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/el.po b/po/el.po
index 8f8b2010..1fc0925c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -137,14 +137,14 @@ msgid "Delete account"
 msgstr "Διαγραφή λογαριασμού"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ναι"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Όχι"
 
@@ -256,7 +256,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Αρχείο"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Αρχείο/---"
 
@@ -330,7 +330,7 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 #, fuzzy
 msgid "/_Tools"
@@ -341,12 +341,12 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
@@ -396,7 +396,7 @@ msgstr "Όνομα:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -566,7 +566,7 @@ msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Κατάλογος"
 
@@ -643,7 +643,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Τέλος"
 
@@ -655,8 +655,8 @@ msgstr "/Προσθήκη..."
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
@@ -701,7 +701,7 @@ msgstr "/Επεξεργασία/Αναίρεση"
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
@@ -710,7 +710,7 @@ msgstr "/Επεξεργασία/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
@@ -723,7 +723,7 @@ msgstr "/Επεξεργασία/Επικόλληση"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
@@ -740,7 +740,7 @@ msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμώ
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Απεικόνιση"
@@ -766,8 +766,8 @@ msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
@@ -787,7 +787,7 @@ msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
@@ -799,127 +799,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ελληνικό (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Τουρκικό (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Απλοποιημένο Κινεζικό (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Παραδοσιακό Κινεζικό (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κυριλλικό (Windows-1251)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
@@ -929,14 +929,14 @@ msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
@@ -1021,7 +1021,7 @@ msgstr "Σύνθεση μηνύματος%s"
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Αποστολή"
@@ -1123,7 +1123,7 @@ msgstr "τύπος MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -1465,12 +1465,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -1640,172 +1640,177 @@ msgstr "Εγγραφή πάνω από το υπάρχον αρχείο;"
 msgid "failed to write configuration to file\n"
 msgstr "απέτυχα να γράψω τις ρυθμίσεις στο αρχείο\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Δημιουργία νέου καταλόγου..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Μετονομασία καταλόγου..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Διαγραφή καταλόγου"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Συνδρομή σε newsgroup..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Διαγραφή newsgroup"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Δημιουργώ την απεικόνιση καταλόγων...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "αρ."
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1815,16 +1820,21 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1835,24 +1845,24 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1861,35 +1871,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -1979,162 +1989,162 @@ msgstr "Δημιουργώ απεικόνιση εικόνας...\n"
 msgid "Can't load the image."
 msgstr "Δεν μπορώ να φορτώσω την εικόνα."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Η IMAP4 σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "δημιουργία IMAP4 σύνδεσης στο %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Το αρχείο σημάνσεων δεν βρέθηκε.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox: η LIST απέτυχε\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "δεν μπορώ να λάβω τον φάκελο\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα τον φάκελο.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν μπορώ να διαβάσω τον φάκελο: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr ""
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Πιστοποίηση"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Στέλνω DATA..."
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2247,7 +2257,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2471,7 +2481,7 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2593,712 +2603,717 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Αρχείο/Κατάλογος/Δημιουργία νέου καταλόγου..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/Αρχείο/Κατάλογος/Μετονομασία καταλόγου..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Αρχείο/Κατάλογος/Διαγραφή καταλόγου"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Αρχείο/Προσθήκη mailbox..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Αρχείο/Κατάλογος"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/Αρχείο/Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Αρχείο/Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Αρχείο/Αποθήκευση ως..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Αρχείο/Εκτύπωση..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/Αρχείο/Έξοδος"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Απεικόνιση/Δομή καταλόγων"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες και κείμενο"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Εικόνες"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Κείμενο"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Απεικόνιση/Ράβδος εργαλείων/Καμία"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Απεικόνιση/Ράβδος κατάστασης"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/Απεικόνιση/Ξεχωριστό παράθυρο δομής καταλόγων"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Απεικόνιση/Ξεχωριστή απεικόνιση μηνυμάτων"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αριθμό"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά ημερομηνία"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αποστολέα"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά μέγεθος"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά θέμα"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά χρώμα ετικέτας"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά σήμανση"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά προσάρτηση"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Περίληψη/Ταξινόμηση/Ταξινόμηση κατά αδιάβαστα"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Περίληψη/Ταξινόμηση/_Attract by subject"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/Απεικόνιση/Απεικόνιση μηνυνάτων"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Περίληψη/Ορισμός εμφανιζόμενων στοιχείων..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Περίληψη/Πήγαινε στο/Προηγούμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Περίληψη/Πήγαινε στο/Επόμενο μήνυμα με ετικέτα"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Περίληψη/Μετακίνηση σε άλλο κατάλογο..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Ιαπωνέζικο (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Μήνυμα"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/Μήνυμα/Αποστολή μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Μήνυμα/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Μήνυμα/Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Μήνυμα/Απάντηση"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/Μήνυμα/Απάντηση σε"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Μήνυμα/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Μήνυμα/Απάντηση σε όλους"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Μήνυμα/Προώθηση"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/Μήνυμα/Προώθηση σαν προσάρτηση"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Μήνυμα/Μετακίνηση..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Μήνυμα/Αντιγραφή..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Μήνυμα/Διαγραφή"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Μήνυμα/Σήμανση"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Mήνυμα/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Mήνυμα/Σήμανση/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Mήνυμα/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Μήνυμα/Λήψη νέων μηνυμάτων"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Μήνυμα/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Περίληψη/Διαγραφή διπλών μηνυμάτων"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/Εκτέλεση"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/Εργαλεία/Παράθυρο καταγραφής"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Ρυθμίσεις"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Ρυθμίσεις/Κοινές επιλογές..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/Ρυθμίσεις/Επιλογές φίλτρων..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Ρυθμίσεις/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Ρυθμίσεις/Επιλογές ανά λογαριασμό..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Ρυθμίσεις/Δημιουργία νέου λογαριασμού..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Ρυθμίσεις/Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Ρυθμίσεις/Αλλαγή τρέχοντος λογαριασμού"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Βοήθεια/_Manual"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Βοήθεια/_Manual/Ιαπωνέζικο"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/Βοήθεια/Σχετικά"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Βοήθεια/_Manual/Αγγλικό"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3308,16 +3323,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3326,160 +3341,160 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3643,30 +3658,30 @@ msgstr ""
 "Η γραμμή εντολής εκτύπωσης είναι άκυρη:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Δεν μπορώ να ανοίξω σημειωμένο αρχείο.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο πηγαίος κατάλογος είναι ίδιος με τον κατάλογο προορισμού.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3764,81 +3779,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "δημιουργώ NNTP σύνδεση στο %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Η NNTP σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "το άρθρο %d έχει προσπελαστεί ήδη.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "λαμβάνω το άρθρο %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "δεν μπορώ να διαβάσω το άρθρο %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "δεν μπορώ να λάβω την λίστα newsgroup\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "δεν μπορώ να στείλω το άρθρο.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "δεν μπορώ να λάβω το άρθρο %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "δεν μπορώ να επιλέξω την ομάδα %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "μη έγκυρη ακολουθία άρθρων: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "δεν υπάρχουν νέα άρθρα.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "λαμβάνω xover %d - %d στο %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "δεν μπορώ να λάβω xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "μη έγκυρη γραμμή xover: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "δεν μπορώ να λάβω xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα xhdr.\n"
 
@@ -5605,17 +5620,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6403,20 +6418,20 @@ msgstr "Δημιουργώ τα νήματα..."
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Αρ."
 
diff --git a/po/es.po b/po/es.po
index f73d1569..972f49d4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2004-12-21 11:18+0100\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Borrar cuenta"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Si"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+No"
 
@@ -260,7 +260,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fichero"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
@@ -332,7 +332,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -341,12 +341,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -396,7 +396,7 @@ msgstr "Nombre:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -573,7 +573,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -648,7 +648,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ninguno"
 
@@ -660,8 +660,8 @@ msgstr "/_Añadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -701,7 +701,7 @@ msgstr "/_Editar/_Deshacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -710,7 +710,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -722,7 +722,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -738,7 +738,7 @@ msgstr "/_Editar/_Cortar todas las líneas largas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
@@ -760,8 +760,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ver/---"
@@ -778,7 +778,7 @@ msgstr "/_Ver/_Regleta"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordenar/Descendente"
@@ -790,127 +790,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Conjunto de códigos/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Conjunto de códigos/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo occidental (ISO-8859-_15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Conjunto de códigos/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Conjunto de códigos/Turco (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
@@ -918,13 +918,13 @@ msgstr "/_Herramientas/_Agenda de direcciones"
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
@@ -1005,7 +1005,7 @@ msgstr "Componer mensaje%s"
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Enviar"
@@ -1111,7 +1111,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1442,12 +1442,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -1613,160 +1613,165 @@ msgstr "¿Sobreescribir el fichero existente?"
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración a fichero\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta `%s' ya existe."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Renombrar carpeta..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Estableciendo información de carpeta...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucción del árbol de carpetas falló."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en `%s'."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1776,16 +1781,21 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "No se puede eliminar la carpeta `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1796,24 +1806,24 @@ msgstr ""
 "Todas las carpetas y mensajes bajo `%s' serán borrados.\n"
 "¿Confirma el borrado?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1822,34 +1832,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón `%s' ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 `%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -1934,156 +1944,156 @@ msgstr "Creando vista de imagen...\n"
 msgid "Can't load the image."
 msgstr "No se puede cargar la imagen."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesión TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear '%s' bajo Entrada\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Error obteniendo la estructura del mensaje.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -2185,7 +2195,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2405,7 +2415,7 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2528,622 +2538,627 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a un fichero mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Conjunto de códigos/_Autodetectar"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Conjunto de códigos/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "¿Vaciar los mensajes de todas las papeleras?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3153,16 +3168,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón `%s' ya existe."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3172,150 +3187,150 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Cuenta por defecto"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3476,30 +3491,30 @@ msgstr ""
 "La orden de impresión es inválida:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de origen y destino idénticas.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3597,81 +3612,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La orden del visualizador MIME es inválida: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexión NNTP con %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La conexión NNTP con %s:%d ha sido rota. Reconectando...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "el artículo %d ya esta en caché.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obteniendo artículo %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no puedo leer el artículo %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "no puedo obtener la lista de grupos\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "no se puede enviar el artículo.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no puedo obtener el artículo %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "no puedo seleccionar grupo: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "no hay artículos nuevos.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "hubo un error obteniendo xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover no válida: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "hubo un error obteniendo xhdr.\n"
 
@@ -5406,17 +5421,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Fecha"
 
@@ -6172,20 +6187,20 @@ msgstr "Construyendo hilos..."
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "No."
 
diff --git a/po/et.po b/po/et.po
index 362a72a6..2908f7b1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -134,14 +134,14 @@ msgid "Delete account"
 msgstr "Kustuta konto"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Jah"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ei"
 
@@ -256,7 +256,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fail"
@@ -278,9 +278,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
@@ -328,7 +328,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -337,12 +337,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -360,17 +360,17 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
@@ -392,7 +392,7 @@ msgstr "Nimi:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -568,7 +568,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Kaust"
 
@@ -643,7 +643,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Mittemiski"
 
@@ -655,8 +655,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -701,7 +701,7 @@ msgstr "/R_edigeeri/_Tühista"
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
@@ -710,7 +710,7 @@ msgstr "/R-edaktor/---"
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
@@ -722,7 +722,7 @@ msgstr "/R_edaktor/_Aseta"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
@@ -739,7 +739,7 @@ msgstr "/R_edaktor/Ää_rista kõik pikad read"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vaade"
@@ -761,8 +761,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_vaade/---"
@@ -779,7 +779,7 @@ msgstr "/_Vaade/Joonla_ud"
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
@@ -791,127 +791,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
@@ -919,13 +919,13 @@ msgstr "/_Tööriist/_Aadressiraamat"
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
@@ -1009,7 +1009,7 @@ msgstr "Kirjuta kiri%s"
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Saada"
@@ -1113,7 +1113,7 @@ msgstr "MIME tüüp"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Suurus"
 
@@ -1445,12 +1445,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -1615,166 +1615,171 @@ msgstr "Kirjutame olemasoleva faili üle?"
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Nimeta kaust ümbe_r..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1784,16 +1789,21 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Ei suuda kausta %s eemaldada."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1804,24 +1814,24 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1830,34 +1840,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -1942,161 +1952,161 @@ msgstr "Loon pildi vaadet...\n"
 msgid "Can't load the image."
 msgstr "Ei suuda lugeda pilti."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP serveri kataloog"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei suuda kirjakasti %s-lt ümber nimetada %s-le\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, 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"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -2198,7 +2208,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2417,7 +2427,7 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2540,642 +2550,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/Näita ko_gu päist"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Tööriist/Käivita"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3184,16 +3199,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3202,153 +3217,153 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3509,30 +3524,30 @@ msgstr ""
 "Trükkimise käsurida pole õige:\n"
 "%s"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada märgi faili.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Viimane number kataloogis %s on %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3630,81 +3645,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME vaataja käsurida pole õige: %s"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "loon NNTP ühendust %s:%d-ga ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP ühendus %s:%d-ga on katkestatud. Taasühendan...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikkel %d on juba hoidlas.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "võtan artikli %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ei saanud artiklit %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ei saanud uudistegrupi nimekirja\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "ei saanud saata artiklit.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ei saanud artiklit %d kohale\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ei saa valida gruppi %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ebasobiv artiklite vahemik: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "uusi artikelid pole.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "*võtan xover-i %d - %d %s-is\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "*ei saa xover'it\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "*xover'i võtmisel tekkis viga\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "*ei saa xhdr-i\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr-i võtmise käigus tekkis viga.\n"
 
@@ -5466,17 +5481,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6238,20 +6253,20 @@ msgstr "Loon teemad..."
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Ei."
 
diff --git a/po/fr.po b/po/fr.po
index 77ca5e2b..c5dfdc4c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2004-12-09 20:16+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -144,14 +144,14 @@ msgid "Delete account"
 msgstr "Supprimer le compte"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Oui"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Non"
 
@@ -268,7 +268,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fichier"
@@ -290,9 +290,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
@@ -340,7 +340,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -349,12 +349,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -372,17 +372,17 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/É_dition"
 
@@ -404,7 +404,7 @@ msgstr "Nom :"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -584,7 +584,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Dossier"
 
@@ -659,7 +659,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Aucun"
 
@@ -671,8 +671,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -712,7 +712,7 @@ msgstr "/É_dition/_Annuler"
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
@@ -721,7 +721,7 @@ msgstr "/É_dition/---"
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
@@ -733,7 +733,7 @@ msgstr "/É_dition/Co_ller"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
@@ -749,7 +749,7 @@ msgstr "/É_dition/Justifier tout le _message"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Affichage"
@@ -771,8 +771,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Affichage/---"
@@ -789,7 +789,7 @@ msgstr "/_Affichage/_Afficher une règle"
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
@@ -801,127 +801,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/_Baltique (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Europe du Nord (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
@@ -929,13 +929,13 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
@@ -1018,7 +1018,7 @@ msgstr "Composition d'un message%s"
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Envoyer"
@@ -1121,7 +1121,7 @@ msgstr "Type MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Taille"
 
@@ -1455,12 +1455,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -1626,161 +1626,166 @@ msgstr "Remplacer le fichier existant ?"
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Renommer le dossier..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, 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:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1790,16 +1795,21 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Impossible de supprimer le dossier « %s »."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1810,24 +1820,24 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être supprimés.\n"
 "Voulez-vous vraiment les supprimer ?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1836,34 +1846,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:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -1948,156 +1958,156 @@ msgstr "Création de la vue de l'image...\n"
 msgid "Can't load the image."
 msgstr "Impossible de charger l'image."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Répertoire IMAP4"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1 : *\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossible de renomer la boîte aux lettres %s en %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -2201,7 +2211,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Suivant"
 
@@ -2421,7 +2431,7 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2550,625 +2560,630 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 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:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichier/_Importer un fichier mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichier/_Exporter vers un fichier mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 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:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau précédent"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau suivant"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réédit_er"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 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:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 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:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 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:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_xécuter"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Supprimer tous les messages dans les corbeilles ?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3177,16 +3192,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3196,150 +3211,150 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Définir comme compte par défaut"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 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:2530
+#: src/mainwindow.c:2538
 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:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3500,30 +3515,30 @@ msgstr ""
 "La ligne de commande d'impression est invalide :\n"
 "« %s »"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Dernier numéro dans le répertoire %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3621,81 +3636,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Création de la connexion NNTP vers %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connexion NNTP vers %s:%d a été coupée. Reconnexion...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "L'article %d a déjà été caché.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Récupération de l'article %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "Impossible de lire l'article %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "Impossible d'obtenir la liste des groupes de discussion\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "Impossible de poster l'article.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "Impossible de récupérer l'article %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossible de sélectionner le groupe : %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "Intervalle d'articles invalide : %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "Pas d'article.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Exécution de xover %d - %d sur %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "Impossible de faire un xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "Une erreur a eu lieu pendant la lecture du xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ligne xover invalide : %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "Impossible d'obtenir xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "Erreur lors de la réception de xhdr.\n"
 
@@ -5436,17 +5451,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Date"
 
@@ -6205,20 +6220,20 @@ msgstr "Construction des threads..."
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "N°"
 
diff --git a/po/gl.po b/po/gl.po
index a0d1c7c0..3eceabc1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Borrar conta"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Si"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Non"
 
@@ -258,7 +258,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
@@ -330,7 +330,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -339,12 +339,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -394,7 +394,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -571,7 +571,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -646,7 +646,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ningún"
 
@@ -658,8 +658,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -703,7 +703,7 @@ msgstr "/_Editar/_Desfacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -712,7 +712,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
@@ -724,7 +724,7 @@ msgstr "/_Editar/_Pegar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -741,7 +741,7 @@ msgstr "/_Editar/_Cortar todas as líneas longas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Ver"
@@ -763,8 +763,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Ver/---"
@@ -781,7 +781,7 @@ msgstr "/_Ver/_Regra"
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
@@ -793,127 +793,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
@@ -921,13 +921,13 @@ msgstr "/_Ferramentas/_Axenda de enderezos"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1012,7 +1012,7 @@ msgstr "Compoñer mensaxe%s"
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Enviar"
@@ -1116,7 +1116,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1447,12 +1447,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -1618,163 +1618,168 @@ msgstr "¿Sobreescribir o ficheiro existente?"
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Renomear carpeta..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1784,16 +1789,21 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Non se pode eliminar a carpeta `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1804,24 +1814,24 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1830,34 +1840,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -1942,160 +1952,160 @@ msgstr "Creando vista de imaxen...\n"
 msgid "Can't load the image."
 msgstr "Non se pode cargar a imaxen."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesión TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "non podo renomear a caixa de correo: %s a %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -2197,7 +2207,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2420,7 +2430,7 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2543,641 +2553,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3187,16 +3202,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3206,153 +3221,153 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3513,30 +3528,30 @@ msgstr ""
 "o comando de impresión non é válido:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3634,81 +3649,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "o comando do visor MIME non é válido: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creando conexión NNTP con %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "perdeuse a conexión NNTP con %s:%d . Reconectando...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d xa esta en caché.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "no podo leer o artículo %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "no podo obter a lista de grupos\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "no se pode enviar o artículo.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "no podo obter o artículo %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "non podo seleccionar grupo %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "no hai artículos novos.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "no se pode obtener xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "ocurriu un erro obtendo xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover non válida: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "non se pode obter xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurriu un erro obtendo xhdr.\n"
 
@@ -5465,17 +5480,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6235,20 +6250,20 @@ msgstr "Construindo xerarquía..."
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Non."
 
diff --git a/po/hr.po b/po/hr.po
index 7c87358b..69c35705 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -135,14 +135,14 @@ msgid "Delete account"
 msgstr "Obriši račun"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Da"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ne"
 
@@ -254,7 +254,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -277,9 +277,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -327,7 +327,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -336,12 +336,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -359,17 +359,17 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Uredi"
 
@@ -391,7 +391,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -560,7 +560,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Spis"
 
@@ -636,7 +636,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ništa"
 
@@ -648,8 +648,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -694,7 +694,7 @@ msgstr "/_Uredi/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -703,7 +703,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
@@ -716,7 +716,7 @@ msgstr "/_Uredi/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
@@ -733,7 +733,7 @@ msgstr "/_Uredi/Sažmi sve duge _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
@@ -759,8 +759,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pregled/---"
@@ -780,7 +780,7 @@ msgstr "/_Pregled/Pr_egledaj izvor"
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
@@ -792,127 +792,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
@@ -922,14 +922,14 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
@@ -1014,7 +1014,7 @@ msgstr "Pisanje poruke%s"
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Pošalji"
@@ -1116,7 +1116,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Veličina"
 
@@ -1451,12 +1451,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -1621,170 +1621,175 @@ msgstr "Prepisati postojeću datoteku?"
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Preimenuj spis..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Obriši spis"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilježi se na _news grupu..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, 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:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1794,16 +1799,21 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Ne mogu premjestiti spis `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1814,24 +1824,24 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1840,35 +1850,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -1953,162 +1963,162 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandučić\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobivanja omota.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, 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"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2220,7 +2230,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2446,7 +2456,7 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2568,709 +2578,714 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Spis/Kreiraj _novi spis..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Spis/_Obriši spis"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unesi mbox datoteku"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/_Stablo spisa"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/_Traka alata"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvrši"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3280,16 +3295,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3298,156 +3313,156 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3610,30 +3625,30 @@ msgstr ""
 "Naredba za ispis je pogrešna:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posljednji broj u direktoriju %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3731,81 +3746,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME preglednika nije ispravna: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu s %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza s %s:%d je pukla. Povezujem ponovo...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne mogu primiti listu news grupa\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "ne mogu dobiti xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom dobivanja xovera.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom dobivanja xhdra.\n"
 
@@ -5558,17 +5573,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6343,20 +6358,20 @@ msgstr "Izgrađujem stablo..."
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/hu.po b/po/hu.po
index 0a12c956..afd1c6aa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-1.9.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2005-06-23 18:30+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -138,14 +138,14 @@ msgid "Delete account"
 msgstr "Hozzáférés törlése"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Igen"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nem"
 
@@ -263,7 +263,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fájl"
@@ -285,9 +285,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
@@ -335,7 +335,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -344,12 +344,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -367,17 +367,17 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
@@ -399,7 +399,7 @@ msgstr "Név:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -572,7 +572,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Mappa"
 
@@ -647,7 +647,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Semmi"
 
@@ -659,8 +659,8 @@ msgstr "/_Hozzáadás..."
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
@@ -700,7 +700,7 @@ msgstr "/_Szerkesztés/_Visszavonás"
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
@@ -709,7 +709,7 @@ msgstr "/_Szerkesztés/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
@@ -721,7 +721,7 @@ msgstr "/_Szerkesztés/_Beillesztés"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
@@ -737,7 +737,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:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Nézet"
@@ -759,8 +759,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Nézet/---"
@@ -777,7 +777,7 @@ msgstr "/_Nézet/V_onalzó"
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
@@ -788,103 +788,103 @@ msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 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:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
@@ -892,13 +892,13 @@ msgstr "/_Eszközök/_Címjegyzék"
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
@@ -979,7 +979,7 @@ msgstr "Üzenet írása%s"
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Küldés"
@@ -1081,7 +1081,7 @@ msgstr "MIME típus"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Méret"
 
@@ -1411,12 +1411,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -1581,160 +1581,165 @@ msgstr "Létező fájl felülírása?"
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem lehetett elmenteni\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Új _mappa létrehozása..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Mappa át_nevezése..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Mappa át_nevezése..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Mappa _törlése"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/_Kuka ürítése"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Ú_j üzenetek ellenőrzése"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa újraépítése"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Ü_zenetek keresése..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Le_töltés"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Hírcsoport _előfizetése..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Hírcsoport e_ltávolítása"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő üzenetek letöltése közben."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1744,16 +1749,21 @@ 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:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "`%s' nem távolítható el."
+
+#: src/folderview.c:2109
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1766,24 +1776,24 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1792,34 +1802,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -1904,155 +1914,155 @@ msgstr "Kép nézet létrehozása...\n"
 msgid "Can't load the image."
 msgstr "Nem lehet betölteni a képet."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP szerver LOGIN kikapcsolva.\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nem lehet beállítani a törölt jelzést: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s root mappa nem létezik\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LISTA lekérdezése közben.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "'%s' nem hozható létre a BEJÖVŐ mappa alatt\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LISTA sikertelen\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nem lehet a postaládát átnevezni: %s -> %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható %s-be/ba\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
@@ -2154,7 +2164,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Következő"
 
@@ -2374,7 +2384,7 @@ msgstr "Adja meg a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2498,611 +2508,616 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa Át_nevezése..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Fájl/_Mappa/Mappa Át_nevezése..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _Törlése"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fájl/_Postaláda/Ú_j üzenetek ellenőrzése az összes postaládában"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fájl/Mbox fájl _importálása..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fájl/Mbox fájl _exportálása..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 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:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Szerkesztés/Üzenet_folyam kiválasztása"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Szerkesztés/_Keresés az aktuális üzenetben..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Szerkesztés/Ü_zenetek keresése..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Üzenet nézet"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsor"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön üz_enetnézet"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Ü_zenetfolyam nézet"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam kifejtése"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden üzenetfolyam bezárása"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző üzenethez"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő üzenethez"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan üzenethez"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan üzenethez"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új üzenethez"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új üzenethez"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt üzenethez"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt üzenethez"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett üzenethez"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett üzenethez"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Üzenet"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Üzenet/Fog_adás"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Üzenet/Fog_adás/_Jelenlegi hozzáférésről"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Üzenet/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Üzenet/Fog_adás/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Üzenet/Ü_zenetek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Üzenet/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Üzenet/_Új üzenet szerkesztése"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Üzenet/Vá_lasz"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Üzenet/_Válasz másnak"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Üzenet/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Üzenet/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Üzenet/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Üzenet/_Továbbítás"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Üzenet/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Üzenet/Á_tirányít"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Üzenet/M_ozgatás..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Üzenet/_Másolás..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Üzenet/_Törlés"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Üzenet/_Megjelöl"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Üzenet/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Üzenet/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Üzenet/_Megjelöl/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Üzenet/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Üzenet/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Üzenet/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Üzenet/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Üzenet/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Üzenet/_Szerkesztés újra"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Eszközök/Küldő hozzáadása a cím_listához..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes üzenet szűrése a mappában"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek szűrése"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kivá_lasztott üzenetek levélszemét szűrése"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszközök/_Futtatás"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Közös _Beállítások..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablon..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/_Akciók..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférés _szerkesztése..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3112,16 +3127,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3130,150 +3145,150 @@ 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:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 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:2530
+#: src/mainwindow.c:2538
 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:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3434,30 +3449,30 @@ msgstr ""
 "Nyomtatási parancs érvénytelen:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nem lehet %s üzenetet %s-ba másolni\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "A jelölő fájlt nem lehet megnyitni.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d üzenet másolása %s-ba ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Az utolsó szám a(z) %s mappában = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3553,81 +3568,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "NNTP kapcsolat létesítése %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Az NNTP kapcsolat %s:%d megszakadt. Újrakapcsolódás...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d cikk már a gyorstárban van.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d cikk fogadása...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d cikket nem lehetett olvasni\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "Hírcsoport lista nem hozzáférhető\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "Nem lehet a cikket elküldeni.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d cikket nem lehet fogadni\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "%s csoport nem választható ki\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "érvénytelen cikk sorozat: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "Nincsenek új cikkek.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "Hírjegyzék fogadása %d - %d %s-ba...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "A hírjegyzék nem elérhető\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "Hiba a hírjegyzék fogadása közben.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "érvénytelen hírjegyzék sor: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "xhdr nem elérhető\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "Hiba történt xhdr vétele közben.\n"
 
@@ -5340,17 +5355,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Dátum"
 
@@ -6106,20 +6121,20 @@ msgstr "Üzenetfolyam felépítése"
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Db"
 
diff --git a/po/it.po b/po/it.po
index 4cff7e12..4ca22bef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.0.0beta3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2005-06-25 16:55+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -138,14 +138,14 @@ msgid "Delete account"
 msgstr "Elimina account"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Sì"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+No"
 
@@ -262,7 +262,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_File"
@@ -284,9 +284,9 @@ msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_File/---"
 
@@ -334,7 +334,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -343,12 +343,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -366,17 +366,17 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Modifica"
 
@@ -398,7 +398,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -576,7 +576,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Cartella"
 
@@ -651,7 +651,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Niente"
 
@@ -663,8 +663,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
@@ -704,7 +704,7 @@ msgstr "/_Modifica/_Annulla"
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
@@ -713,7 +713,7 @@ msgstr "/_Modifica/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
@@ -725,7 +725,7 @@ msgstr "/_Modifica/_Incolla"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
@@ -741,7 +741,7 @@ msgstr "/_Modifica/A capo tutte le righe _lunghe"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visualizza"
@@ -763,8 +763,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
@@ -781,7 +781,7 @@ msgstr "/_Visualizza/R_ighello"
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
@@ -792,103 +792,103 @@ msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
@@ -896,13 +896,13 @@ msgstr "/S_trumenti/_Rubrica"
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
@@ -983,7 +983,7 @@ msgstr "Composizione messaggio %s"
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Invia"
@@ -1086,7 +1086,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Dimensione"
 
@@ -1417,12 +1417,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -1588,160 +1588,165 @@ msgstr "Sovrascrivere il file esistente?"
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Rinomina cartella..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1751,16 +1756,21 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Impossibile rimuovere la cartella «%s»."
+
+#: src/folderview.c:2109
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1774,24 +1784,24 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1800,34 +1810,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -1912,155 +1922,155 @@ msgstr "Creazione della vista dell'immagine...\n"
 msgid "Can't load the image."
 msgstr "Impossibile caricare l'immagine."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Il server IMAP4 disabilita il LOGIN.\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -2162,7 +2172,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Successivo"
 
@@ -2382,7 +2392,7 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2506,611 +2516,616 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_File/Ca_rtella/_Rinomina cartella..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3120,16 +3135,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3139,149 +3154,149 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3442,30 +3457,30 @@ msgstr ""
 "La riga di comando per la stampa non è valida:\n"
 "«%s»"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copia del messaggio %s%c%d in %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimo numero nella cartella %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3560,81 +3575,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La riga di comando del visualizzatore MIME non è valida: «%s»"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Creazione della connessione NNTP con %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "La connessione NNTP a %s:%d è stata interrotta. Riconnessione...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "l'articolo %d è già nella cache.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ricezione dell'articolo %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "impossibile leggere l'articolo %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "impossibile recuperare la lista dei newsgroup\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "impossibile inviare l'articolo.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "impossibile recuperare l'articolo %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "impossibile selezionare il gruppo: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervallo di articoli non valido: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "non ci sono nuovi articoli.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ricezione di xover %d - %d in %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "impossibile ricevere xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "si è verificato un errore durante la ricezione di xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "riga xover non valida: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "impossibile ricevere xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "si è verificato un errore durante la ricezione di xhdr.\n"
 
@@ -5350,17 +5365,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6120,20 +6135,20 @@ msgstr "Costruzione dei thread..."
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "No."
 
diff --git a/po/ja.po b/po/ja.po
index 8995dbe5..d25d33fe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -135,14 +135,14 @@ msgid "Delete account"
 msgstr "アカウントの削除"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "はい"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+いいえ"
 
@@ -259,7 +259,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -281,9 +281,9 @@ msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
@@ -331,7 +331,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -340,12 +340,12 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -363,17 +363,17 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
@@ -395,7 +395,7 @@ msgstr "名前:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -570,7 +570,7 @@ msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -645,7 +645,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "なし"
 
@@ -657,8 +657,8 @@ msgstr "/追加(_A)..."
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
@@ -698,7 +698,7 @@ msgstr "/編集(_E)/元に戻す(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
@@ -707,7 +707,7 @@ msgstr "/編集(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
@@ -719,7 +719,7 @@ msgstr "/編集(_E)/ペースト(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
@@ -735,7 +735,7 @@ msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/表示(_V)"
@@ -757,8 +757,8 @@ msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
@@ -775,7 +775,7 @@ msgstr "/表示(_V)/ルーラ(_U)"
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/表示(_V)/文字エンコーディング(_E)"
 
@@ -786,103 +786,103 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/自動(_A)"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/表示(_V)/文字エンコーディング(_E)/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/欧米 (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/バルト諸国 (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ギリシャ語 (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/ヘブライ語 (Windows-1255)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/トルコ語 (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/キリル文字 (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/簡体字中国語 (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/繁体字中国語 (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/タイ語 (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
@@ -890,13 +890,13 @@ msgstr "/ツール(_T)/アドレス帳(_A)"
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
@@ -977,7 +977,7 @@ msgstr "メッセージの作成%s"
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "送信"
@@ -1082,7 +1082,7 @@ msgstr "MIME タイプ"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "サイズ"
 
@@ -1412,12 +1412,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -1582,160 +1582,164 @@ msgstr "既存のファイルを上書きしますか?"
 msgid "failed to write configuration to file\n"
 msgstr "設定のファイルへの書き込みに失敗しました\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/新規フォルダを作成(_N)..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/フォルダ名を変更(_R)..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+msgid "/_Move folder..."
+msgstr "/フォルダを移動(_M)..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/フォルダを削除(_D)"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/ごみ箱を空にする(_T)"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/新着メッセージをチェック(_C)"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/フォルダツリーを再構築(_E)"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/メッセージを検索(_S)..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/ダウンロード(_L)"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/ニュースグループを購読(_B)..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/ニュースグループを削除(_R)"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "総数"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1745,16 +1749,21 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, c-format
+msgid "Can't move the folder `%s'."
+msgstr "フォルダ `%s' を移動できません。"
+
+#: src/folderview.c:2109
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1767,24 +1776,24 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "フォルダ `%s' を削除できません。"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1793,34 +1802,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -1905,155 +1914,155 @@ msgstr "イメージビューを作成中...\n"
 msgid "Can't load the image."
 msgstr "画像を読み込めません。"
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s へのIMAP4の接続が切れています。再接続します...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAPサーバは LOGIN を無効にしています。\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d へのIMAP4の接続を確立中...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "TLS セッションを開始できません。\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -2155,7 +2164,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "次へ"
 
@@ -2375,7 +2384,7 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2507,613 +2516,617 @@ msgstr ""
 "以前のバージョンの設定が見つかりました。\n"
 "移行しますか?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/ファイル(_F)/フォルダ(_F)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/新規フォルダを作成(_N)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダ名を変更(_R)..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを移動(_M)..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/ファイル(_F)/フォルダ(_F)/フォルダを削除(_D)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを追加(_M)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/ファイル(_F)/メールボックス(_M)/メールボックスを削除(_R)"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/ファイル(_F)/メールボックス(_M)/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/ファイル(_F)/メールボックス(_M)/新着メッセージをチェック(_C)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/ファイル(_F)/メールボックス(_M)/すべてのメールボックスの新着メッセージを"
 "チェック(_A)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/ファイル(_F)/mboxファイルをインポート(_I)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/ファイル(_F)/mboxファイルにエクスポート(_E)..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/ファイル(_F)/すべてのごみ箱を空にする(_T)"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/ファイル(_F)/名前を付けて保存(_S)..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/ファイル(_F)/印刷(_P)..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/ファイル(_F)/オフラインにする(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/ファイル(_F)/終了(_X)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/編集(_E)/スレッドを選択(_T)"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/編集(_E)/現在のメッセージ内を検索(_F)..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/編集(_E)/メッセージを検索(_S)..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/表示(_V)/表示・非表示(_D)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/表示(_V)/表示・非表示(_D)/フォルダツリー(_F)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/表示(_V)/表示・非表示(_D)/メッセージビュー(_M)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコンと文字(_A)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/アイコン(_I)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/文字(_T)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/表示(_V)/表示・非表示(_D)/ツールバー(_T)/非表示(_N)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/表示(_V)/表示・非表示(_D)/ステータスバー(_B)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/表示(_V)/フォルダツリーを分離(_O)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/表示(_V)/メッセージビューを分離(_M)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/表示(_V)/ソート(_S)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/表示(_V)/ソート(_S)/番号順(_N)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/表示(_V)/ソート(_S)/サイズ順(_I)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/表示(_V)/ソート(_S)/日付順(_D)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/表示(_V)/ソート(_S)/差出人順(_F)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/表示(_V)/ソート(_S)/宛先順(_R)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/表示(_V)/ソート(_S)/件名順(_S)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/表示(_V)/ソート(_S)/カラーラベル順(_C)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/表示(_V)/ソート(_S)/マーク(_M)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/表示(_V)/ソート(_S)/未読(_U)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/表示(_V)/ソート(_S)/添付(_T)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/表示(_V)/ソート(_S)/ソートしない(_O)"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/表示(_V)/ソート(_S)/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/表示(_V)/ソート(_S)/昇順"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/表示(_V)/ソート(_S)/降順"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/表示(_V)/ソート(_S)/件名でまとめる(_A)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/表示(_V)/スレッド表示(_R)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/表示(_V)/すべてのスレッドを展開(_X)"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/表示(_V)/すべてのスレッドを閉じる(_L)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/表示(_V)/表示項目の設定(_I)..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/表示(_V)/移動(_G)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/表示(_V)/移動(_G)/前のメッセージ(_P)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/表示(_V)/移動(_G)/次のメッセージ(_N)"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/表示(_V)/移動(_G)/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/表示(_V)/移動(_G)/前の未読メッセージ(_R)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/表示(_V)/移動(_G)/次の未読メッセージ(_E)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/表示(_V)/移動(_G)/前の新着メッセージ(_W)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/表示(_V)/移動(_G)/次の新着メッセージ(_X)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/表示(_V)/移動(_G)/前のマーク付きメッセージ(_M)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/表示(_V)/移動(_G)/次のマーク付きメッセージ(_A)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/表示(_V)/移動(_G)/前のラベル付きメッセージ(_L)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/表示(_V)/移動(_G)/次のラベル付きメッセージ(_B)"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/表示(_V)/移動(_G)/別のフォルダ(_F)..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/表示(_V)/文字エンコーディング(_E)/自動検出(_A)"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/日本語 (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/表示(_V)/すべてのヘッダを表示(_H)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/表示(_V)/サマリを更新(_U)"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/メッセージ(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/メッセージ(_M)/受信(_V)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/メッセージ(_M)/受信(_V)/現在のアカウントから受信(_C)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/メッセージ(_M)/受信(_V)/全アカウントから受信(_A)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/メッセージ(_M)/受信(_V)/受信を中止(_G)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/メッセージ(_M)/受信(_V)/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/メッセージ(_M)/送信待機中のメッセージを送信(_S)"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/メッセージ(_M)/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/メッセージ(_M)/新規メッセージを作成(_N)"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/メッセージ(_M)/返信(_R)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/メッセージ(_M)/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/メッセージ(_M)/転送(_F)"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/メッセージ(_M)/添付として転送(_W)"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/メッセージ(_M)/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/メッセージ(_M)/移動(_O)..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/メッセージ(_M)/コピー(_C)..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/メッセージ(_M)/削除(_D)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク(_M)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/メッセージ(_M)/マーク(_M)/マーク解除(_U)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/メッセージ(_M)/マーク(_M)/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/メッセージ(_M)/マーク(_M)/未読としてマーク(_E)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/メッセージ(_M)/マーク(_M)/読んだことにする(_D)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/メッセージ(_M)/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 msgid "/_Message/Set as _junk mail"
 msgstr "/メッセージ(_M)/迷惑メールに指定(_J)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/メッセージ(_M)/迷惑メールではない(_U)"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/メッセージ(_M)/再編集(_E)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/ツール(_T)/差出人をアドレス帳に追加(_K)..."
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/ツール(_T)/フォルダ中のすべてのメッセージを振り分け(_F)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/ツール(_T)/選択中のメッセージを振り分け(_S)"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/自動(_A)"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Fromから"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Toから"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/ツール(_T)/振り分けルールを作成(_C)/_Subjectから"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/ツール(_T)/フォルダ中の迷惑メールを振り分け(_J)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/ツール(_T)/選択メッセージ中の迷惑メールを振り分け(_M)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/メッセージ(_M)/重複メッセージを削除(_P)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/ツール(_T)/実行(_X)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/ツール(_T)/ログウィンドウ(_L)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/全般の設定(_C)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/振り分けの設定(_F)..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/テンプレート(_T)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/アクション(_A)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/現在のアカウントの設定(_P)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新規アカウントの作成(_N)..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/アカウントの編集(_E)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/現在のアカウントを変更(_H)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/ヘルプ(_H)/マニュアル(_M)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/英語(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/ヘルプ(_H)/マニュアル(_M)/日本語(_J)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/ヘルプ(_H)/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/ヘルプ(_H)/_FAQ/英語(_E)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/ヘルプ(_H)/_FAQ/ドイツ語(_G)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/ヘルプ(_H)/_FAQ/スペイン語(_S)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/ヘルプ(_H)/_FAQ/フランス語(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "すべてのごみ箱の中のメッセージを削除しますか?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3122,16 +3135,16 @@ msgstr ""
 "メールボックスの位置を入力してください。\n"
 "既存のメールボックスを指定すると自動的にスキャンします。"
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3140,149 +3153,149 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3443,30 +3456,30 @@ msgstr ""
 "印刷のコマンドラインが無効です:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "マークファイルを開けません。\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3568,81 +3581,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME ビューアのコマンドラインが無効です: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d への NNTP の接続を確立中...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d への NNTP の接続が切れています。再接続します...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d 番の記事はすでにキャッシュされています。\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d 番の記事を取得しています...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d 番の記事を読めません\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ニュースグループリストを取得できません\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "記事をポストできません。\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "%d 番の記事を取得できません\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "グループを選択できません: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無効な記事の範囲です: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "新着記事はありません。\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d を取得中 (%s)...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "xover 情報を取得できません\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "xover 情報を取得中にエラーが発生しました。\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "無効な xover 行です: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "xhdr 情報を取得できません\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr 情報を取得中にエラーが発生しました。\n"
 
@@ -5348,17 +5361,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "日付"
 
@@ -6115,20 +6128,20 @@ msgstr "スレッドを構築中..."
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "番号"
 
diff --git a/po/ko.po b/po/ko.po
index ececbab3..02e9a099 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -123,14 +123,14 @@ msgid "Delete account"
 msgstr "계정 삭제"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "확인"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "아니요"
 
@@ -245,7 +245,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -267,9 +267,9 @@ msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
@@ -317,7 +317,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -326,12 +326,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -349,17 +349,17 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
@@ -381,7 +381,7 @@ msgstr "이름:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -551,7 +551,7 @@ msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "폴더"
 
@@ -626,7 +626,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "없음"
 
@@ -638,8 +638,8 @@ msgstr "/추가(_A)..."
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
@@ -684,7 +684,7 @@ msgstr "/편집(_E)/실행취소(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
@@ -693,7 +693,7 @@ msgstr "/편집(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
@@ -705,7 +705,7 @@ msgstr "/편집(_E)/붙여넣기(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
@@ -722,7 +722,7 @@ msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/보기(_V)"
@@ -744,8 +744,8 @@ msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
@@ -762,7 +762,7 @@ msgstr "/보기(_V)/Ruler(_u)"
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
@@ -774,127 +774,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
@@ -902,13 +902,13 @@ msgstr "/도구(_T)/주소록(_A)"
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
@@ -992,7 +992,7 @@ msgstr "메시지%s 편집"
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "메일 발송"
@@ -1095,7 +1095,7 @@ msgstr "마임 타입"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "크기"
 
@@ -1427,12 +1427,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -1597,163 +1597,168 @@ msgstr "기존 파일을 덮어쓰시겠습니까?"
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/새 폴더 만들기(_n)..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/폴더 이름 바꾸기(_R)..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/폴더 지우기(_D)"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/메시지 찾기(_S)..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/뉴스그룹 구독(_b)..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/뉴스그룹 삭제(_R)"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "전체"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1763,16 +1768,21 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "`%s' 폴더를 제거할 수가 없습니다."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1783,24 +1793,24 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1809,34 +1819,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -1921,161 +1931,161 @@ msgstr "이미지 뷰를 생성합니다...\n"
 msgid "Can't load the image."
 msgstr "이미지를 불러올 수가 없습니다."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 서버 디렉토리"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "TLS 세션을 시작할 수 없습니다.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -2177,7 +2187,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "다음"
 
@@ -2393,7 +2403,7 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2516,642 +2526,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/보기(_V)/모든 헤더보기(_h)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3161,16 +3176,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3179,153 +3194,153 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3486,30 +3501,30 @@ msgstr ""
 "인쇄 명령어가 올바르지않습니다:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "표시 파일을 열 수가 없습니다.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3606,81 +3621,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d로 NNTP 접속을 생성합니다...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d로의 NNTP 연결이 끊어졌습니다. 다시 연결합니다...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "기사 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "기사 %d를 얻습니다...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "기사 %d를 읽을 수가 없습니다\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "뉴스그룹 목록을 받을 수가 없습니다\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "기사를 올릴 수가 없습니다.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "기사 %d를 가져올 수가 없습니다\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "%s 그룹을 선택할 수가 없습니다\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "올바르지않은 기사 범위: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "새 기사가 없습니다.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%3$s에서 %1$d - %2$d xover를 가져옴...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "xover를 가져올 수가 없습니다\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "xover를 얻는 도중 에러가 발생.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "올바르지않은 xover line: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "xhdr을 가져올 수가 없습니다\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "xhdr을 얻는 도중 에러가 발생.\n"
 
@@ -5406,17 +5421,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "날짜"
 
@@ -6172,20 +6187,20 @@ msgstr "쓰레드를 만듭니다..."
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "번호"
 
diff --git a/po/lt.po b/po/lt.po
index 3ab78ab5..e13f5f74 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: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -134,14 +134,14 @@ msgid "Delete account"
 msgstr "Pašalinti sąskaitą"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Taip"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ne"
 
@@ -258,7 +258,7 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Byla"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/_Byla/Naujas _serveris"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Byla/---"
 
@@ -330,7 +330,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -339,12 +339,12 @@ msgstr "/Į_rankiai"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF bylą"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
@@ -394,7 +394,7 @@ msgstr "Vardas:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -566,7 +566,7 @@ msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -641,7 +641,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Nieko"
 
@@ -653,8 +653,8 @@ msgstr "/Pri_dėti..."
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
@@ -694,7 +694,7 @@ msgstr "/_Taisyti/_Atšaukti"
 msgid "/_Edit/_Redo"
 msgstr "/_Taisyti/Pa_kartoti"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Taisyti/---"
@@ -703,7 +703,7 @@ msgstr "/_Taisyti/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisyti/Iškirp_ti"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Taisyti/Kopi_juoti"
 
@@ -715,7 +715,7 @@ msgstr "/_Taisyti/Į_dėti"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisyti/Įdėti kaip _citatą"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Taisyti/Žymėti _viską"
 
@@ -731,7 +731,7 @@ msgstr "/_Taisyti/Laužyti _visas ilgas eilutes"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisyti/_Automatiškai laužyti"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Rodyti"
@@ -753,8 +753,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Rodyti/Kam _atsakyti"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Rodyti/---"
@@ -771,7 +771,7 @@ msgstr "/_Rodyti/_Liniuotė"
 msgid "/_View/_Attachment"
 msgstr "/_Rodyti/Prise_gtos bylos"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
@@ -782,103 +782,103 @@ msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Rodyti/Simbolių ko_duotė/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Rodyti/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
@@ -886,13 +886,13 @@ msgstr "/Į_rankiai/_Adresų knyga"
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
@@ -973,7 +973,7 @@ msgstr "Rašyti laišką%s"
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Siųsti"
@@ -1074,7 +1074,7 @@ msgstr "MIME tipas"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Dydis"
 
@@ -1404,12 +1404,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -1574,160 +1574,165 @@ msgstr "Perrašyti egzistuojančią bylą?"
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko įrašyti į bylą\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Gaunami"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Sukurti _naują katalogą..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalogą..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Pe_rvadinti katalogą..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Iš_trinti katalogą"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Išvaly_ti šiukšlinę"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti paštą"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalogų medį"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/I_eškoti žinučių"
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/_Atsisiųsti"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Prisijungti prie naujienų grupės"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Paša_linti naujienų grupę"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Nesk."
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Siunčiamos žinutės („%s“)..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida siunčiant žinutes („%s“)."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1737,16 +1742,21 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Negaliu pašalinti katalogo „%s“"
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1757,24 +1767,24 @@ msgstr ""
 "Visi pakatalogiai ir žinutės kataloge „%s“ bus ištrinti.\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1783,34 +1793,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -1895,155 +1905,155 @@ msgstr "Sukuriama paveikslėlio peržiūra...\n"
 msgid "Can't load the image."
 msgstr "Negaliu įkelti paveikslėlio."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 serveris panaikina LOGIN.\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(siunčiama byla...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu prirašyti žinutės į %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -2145,7 +2155,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Kitas"
 
@@ -2365,7 +2375,7 @@ msgstr "Įveskite slaptažodį"
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2489,612 +2499,617 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Byla/_Katalogas"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Byla/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Byla/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Byla/_Katalogas/Pe_rvadinti..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Byla/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Byla/_Dėžutė"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Byla/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Byla/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Byla/_Dėžutė/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas ž_inutes"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Byla/_Dėžutė/Patikrinti naujas žinu_tes visose dėžutėse"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Byla/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Byla/_Importuoti „mbox“ bylą..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Byla/_Eksportuoti į „mbox“ bylą..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Byla/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Byla/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Byla/_Spausdinti..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Byla/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Byla/Iš_eiti"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisyti/Pažymė_ti giją"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisyti/_Rasti žinutėje"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisyti/_Ieškoti žinučių..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Žinutės peržiūra"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/Piktogr_amos ir tekstas"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Rodyti/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Rodyti/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/_Rodyti/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Rodyti/_Rikiuoti"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Rodyti/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Rodyti/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Rodyti/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Rodyti/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Rodyti/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Rodyti/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Rodyti/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Rodyti/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Rodyti/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Rodyti/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Rodyti/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Rodyti/_Rikiuoti/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Rodyti/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Rodyti/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Rodyti/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Rodyti/_Gijų peržiūra"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Rodyti/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Rodyti/Su_traukti visas gijas"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Rodyti/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Rodyti/_Eiti į"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Rodyti/_Eiti į/_Ankstesnė žinutė"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Rodyti/_Eiti į/_Kita žinutė"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Rodyti/_Eiti į/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė neskaityta žinutė"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Rodyti/_Eiti į/Kita neskaityta žinutė"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė nauja žinutė"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Rodyti/_Eiti į/Kita nauja žinutė"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė pažymėta žinutė"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Rodyti/_Eiti į/Kita pažymėta žinutė"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Rodyti/_Eiti į/Ankstesnė žinutė su etikete"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Rodyti/_Eiti į/Kita žinutė su etikete"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Rodyti/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Rodyti/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Rodyti/Atverti naujame _lange"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Rodyti/Žinutės pr_adinis tekstas"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Rodyti/Rodyti _visas antraštes"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Ži_nutė"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/Ži_nutė/_Gauti"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Ži_nutė/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/Ži_nutė/_Gauti/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Ži_nutė/_Siųsti žinutes eilėje"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Ži_nutė/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Ži_nutė/Rašyti _naują"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Ži_nutė/_Atsakyti"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Ži_nutė/Atsak_yti kam"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ži_nutė/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ži_nutė/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ži_nutė/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Ži_nutė/_Persiųsti"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ži_nutė/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Ži_nutė/Nukreip_ti"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Ži_nutė/Per_kelti..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Ži_nutė/K_opijuoti..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Ži_nutė/_Trinti"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Ži_nutė/Žy_ma"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Ži_nutė/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Ži_nutė/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Ži_nutė/Žy_ma/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Ži_nutė/Žy_ma/Ne_skaityta"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Ži_nutė/Žy_ma/Skai_tyta"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Ži_nutė/Žy_ma/_Visos kaip skaitytos"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 msgid "/_Message/Set as _junk mail"
 msgstr "/Ži_nutė/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ži_nutė/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti žinutes kataloge"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktas žinutes"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingas žinutes kataloge"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingas tarp pa_sirinktų žinučių"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodas žinutes"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/Į_rankiai/Vykdyti"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Ištrinti žinutes iš visų šiukšlinių?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3104,16 +3119,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3122,149 +3137,149 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurios bylos jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
@@ -3425,30 +3440,30 @@ msgstr ""
 "Neteisinga spausdinimo komanda:\n"
 "„%s“"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti žinutės %s į %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti žymų bylos.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Paskutinis numeris kataloge %s - %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3543,81 +3558,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Bloga MIME žiūryklės komanda: „%s“"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "sukuriu NNTP prisijungimą prie %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP prisijungimas prie %s:%d buvo nutrauktas. Jungiuosi iš naujo...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "žinutė %d jau buvo įkelta.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "gaunama žinutė %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "negaliu perskaityti žinutės %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "negaliu gauti naujienų grupės sąrašo\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "negaliu paskelbti žinutės.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "negaliu gauti žinutės %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "negaliu pažymėti grupės: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neteisingas žinučių intervalas: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "nėra naujų žinučių.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "gaunamas xover %d - %d, %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "negaliu gauti xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "klaida gaunant xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "bloga xover eilutė: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "negaliu gauti xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "klaida gaunant xhdr.\n"
 
@@ -5330,17 +5345,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6098,20 +6113,20 @@ msgstr "Statomos gijos..."
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota žinučių: %d"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/nl.po b/po/nl.po
index b939ca39..701bf5d8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -138,14 +138,14 @@ msgid "Delete account"
 msgstr "Account verwijderen"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ja"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nee"
 
@@ -260,7 +260,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Bestand"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
@@ -332,7 +332,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -341,12 +341,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Be_werken"
 
@@ -396,7 +396,7 @@ msgstr "Naam:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -572,7 +572,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Accounts"
 
@@ -647,7 +647,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Geen"
 
@@ -659,8 +659,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -704,7 +704,7 @@ msgstr "/B_ewerken/_Ongedaan maken"
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
@@ -713,7 +713,7 @@ msgstr "/B_ewerken/---"
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
@@ -725,7 +725,7 @@ msgstr "/B_ewerken/_Plakken"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
@@ -742,7 +742,7 @@ msgstr "/B_ewerken/Regelterugloop in hele bericht"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/B_eeld"
@@ -764,8 +764,8 @@ msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/B_eeld/---"
@@ -782,7 +782,7 @@ msgstr "/B_eeld/_Lineaal"
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
@@ -794,127 +794,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/B_eeld/Codering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/B_eeld/Codering/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/B_eeld/Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/B_eeld/_Codering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/B_eeld/_Codering/Centraaleuropees (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/B_eeld/_Codering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/B_eeld/_Codering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/B_eeld/_Codering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/B_eeld/_Codering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/B_eeld/_Codering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/B_eeld/_Codering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
@@ -922,13 +922,13 @@ msgstr "/_Gereedschap/_Adresboek"
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
@@ -1012,7 +1012,7 @@ msgstr "Bericht opstellen%s"
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Verzenden"
@@ -1116,7 +1116,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Grootte"
 
@@ -1448,12 +1448,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -1619,163 +1619,168 @@ msgstr "Bestaand bestand overschrijven?"
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Map _hernoemen"
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Geen ongelezen berichten."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1785,16 +1790,21 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Kan map '%s' niet verwijderen."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1805,24 +1815,24 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1831,34 +1841,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -1943,164 +1953,164 @@ msgstr "Plaatje wordt weergegeven...\n"
 msgid "Can't load the image."
 msgstr "Kan plaatje niet weergeven."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server-map"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderde vlaggen: %d niet instellen\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markeerbestand is niet gevonden\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Ik kan geen mailbox maken: LIST mislukt\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "Ik kan geen mailbox maken\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "Ik kan de mailbox niet verwijderen\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "Ik kan de envelope niet verkrijgen\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelope.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Ik kan de envelope niet verwerken: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Identificatiemethode"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht %s niet toevoegen\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %d niet naar %s kopiëren\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout tijdens IMAP opdracht: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -2203,7 +2213,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Volgende"
 
@@ -2420,7 +2430,7 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2545,641 +2555,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Bestand/_Map/Map _hernoemen..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/Mailbox toevoegen..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Mailbox verwijderen"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Bestand/Mbox bestand importeren..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Bestand/Mbox bestand _exporteren..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _leegmaken"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Bijlage _invoegen"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/B_ewerken/_Discussie selecteren"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/_Huidig bericht doorzoeken..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichten door_zoeken..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/B_eeld/_Tonen of Verbergen"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/B_eeld/_Tonen of Verbergen/_Accountlijst"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/B_eeld/_Tonen of Verbergen/_Bericht"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/B_eeld/_Tonen of Verbergen/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/B_eeld/_Tonen of Verbergen/Status_balk"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/B_eeld/Acc_ountlijst los"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/B_eeld/_Bericht los"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/B_eeld/_Sorteren"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/B_eeld/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/B_eeld/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/B_eeld/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/B_eeld/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/B_eeld/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/B_eeld/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/B_eeld/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/B_eeld/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/B_eeld/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/B_eeld/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/B_eeld/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/B_eeld/_Sorteren/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/B_eeld/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/B_eeld/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/B_eeld/Ge_nest"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/B_eeld/Discussies _uitklappen"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/B_eeld/Discussies _inklappen"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/B_eeld/Beeld_item instellen..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/B_eeld/_Ga naar"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/B_eeld/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/B_eeld/_Ga naar/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/B_eeld/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/B_eeld/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/B_eeld/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/B_eeld/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/B_eeld/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/B_eeld/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/B_eeld/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/B_eeld/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/B_eeld/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/B_eeld/Codering/Automatisch"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/B_eeld/_Codering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/E-mail _ophalen"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3189,16 +3204,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3208,153 +3223,153 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3515,30 +3530,30 @@ msgstr ""
 "Afdrukopdracht is ongeldig:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Laatste nummer in map %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3636,83 +3651,83 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "verbinding met nieuwsserver (NNTP) %s%d wordt opgezet...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "De NNTP-verbinding met %s:%d is verbroken. Opnieuw contact aan het "
 "leggen...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artikel %d is al gebufferd.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "artikel %d wordt opgehaald...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan artikel %d niet lezen\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "kan nieuwgroepenlijst niet ophalen\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "kan het ertikel niet versturen.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan het artikel %d niet ophalen\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "kan groep %s niet selecteren\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ongeldig artikelbereik: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "geen nieuwe artikelen.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "xover %d - %d uit %s wordt opgehaald...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "Kan xover niet ophalen\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "Kan xhdr niet ophalen\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de xhdr.\n"
 
@@ -5480,17 +5495,17 @@ msgid "Attachment"
 msgstr "Bijvoeging"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6250,20 +6265,20 @@ msgstr "Discussies worden bij elkaar gevoegd..."
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/pl.po b/po/pl.po
index 3e3b0cc4..870b42fe 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: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -133,14 +133,14 @@ msgid "Delete account"
 msgstr "Usuń konto"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Tak"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nie"
 
@@ -257,7 +257,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Plik"
@@ -279,9 +279,9 @@ msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
@@ -329,7 +329,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -338,12 +338,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -361,17 +361,17 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Edycja"
 
@@ -393,7 +393,7 @@ msgstr "Nazwa:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -571,7 +571,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Katalog"
 
@@ -646,7 +646,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Brak"
 
@@ -658,8 +658,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
@@ -699,7 +699,7 @@ msgstr "/_Edycja/_Cofnij"
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
@@ -708,7 +708,7 @@ msgstr "/_Edycja/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
@@ -720,7 +720,7 @@ msgstr "/_Edycja/_Wstaw"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
@@ -736,7 +736,7 @@ msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Widok"
@@ -758,8 +758,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Widok/---"
@@ -776,7 +776,7 @@ msgstr "/_Widok/_Linijka"
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
@@ -787,103 +787,103 @@ msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
@@ -891,13 +891,13 @@ msgstr "/_Narzędzia/_Książka adresowa"
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
@@ -978,7 +978,7 @@ msgstr "Utwórz wiadomość%s"
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Wyślij"
@@ -1080,7 +1080,7 @@ msgstr "typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -1410,12 +1410,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -1580,160 +1580,165 @@ msgstr "Czy nadpisać istniejący plik?"
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Utwórz _nowy katalog..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Zmień nazwę katalogu..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Usuń katalog"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Opróżnij śmie_tnik"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Sprawdź nowe wiadomoś_ci"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalogów"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomości..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grupę news..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Usuń g_rupę news"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1743,16 +1748,21 @@ 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:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Nie można usunąć katalogu \"%s\"."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1763,24 +1773,24 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1789,34 +1799,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -1901,157 +1911,157 @@ msgstr "Tworzenie widoku obrazu...\n"
 msgid "Can't load the image."
 msgstr "Nie można załadować obrazu."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Katalog serwera IMAP4."
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Nie można uruchomić sesji TLS\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie można zmienić nazwy skrzynki: %s na %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, 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"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, 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"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, 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"
@@ -2153,7 +2163,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Następna"
 
@@ -2373,7 +2383,7 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2496,615 +2506,620 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Pokaż wszystkie na_główki"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzędzia/_Wykonaj"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3114,16 +3129,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3133,150 +3148,150 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3437,30 +3452,30 @@ msgstr ""
 "Błędne polecenie wydruku:\n"
 "\"%s\""
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nie można skopiować wiadomości %s do %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ostatni numer w katalogu %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3555,82 +3570,82 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "tworzenie połączenia NNTP z %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie NNTP %s:%d zostało zerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "artykuł %d został już zapamiętany.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "pobieranie artykułu %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nie można odczytać artykułu %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "nie można pobrać listy grup news\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "nie można wysłać artykułu.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nie można odebrać artykułu %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "nie można wybrać grupy: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artykułu: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "brak nowych artykułów.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "nie można pobrać xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "błąd podczas pobierania xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "nie można pobrać xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "błąd podczas pobierania xhdr.\n"
 
@@ -5349,17 +5364,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6130,20 +6145,20 @@ msgstr "Tworzenie wątków..."
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 92e0c620..15e32299 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2005-06-23 22:21-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Apagar conta"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Sim"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Não"
 
@@ -260,7 +260,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Livro de Endereços"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
@@ -332,7 +332,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -341,12 +341,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editar"
 
@@ -396,7 +396,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -573,7 +573,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Pasta"
 
@@ -648,7 +648,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Nenhuma"
 
@@ -660,8 +660,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
@@ -701,7 +701,7 @@ msgstr "/_Editar/_Desfazer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -710,7 +710,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
@@ -722,7 +722,7 @@ msgstr "/_Editar/Co_lar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
@@ -738,7 +738,7 @@ msgstr "/_Editar/Quebrar todas as _linhas grandes"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/E_xibir"
@@ -760,8 +760,8 @@ msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/E_xibir/---"
@@ -778,7 +778,7 @@ msgstr "/E_xibir/_Régua"
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -789,103 +789,103 @@ msgstr "/E_xibir/Codificação de caracteres/_Automático"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 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:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 
@@ -893,13 +893,13 @@ msgstr "/_Ferramentas/_Livro de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -980,7 +980,7 @@ msgstr "Compondo mensagem%s"
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Enviar"
@@ -1082,7 +1082,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Tamanho"
 
@@ -1413,12 +1413,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -1585,160 +1585,165 @@ msgstr "Sobrescrever o arquivo existente?"
 msgid "failed to write configuration to file\n"
 msgstr "falhou ao gravar a configuração no arquivo\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Renomear pasta..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/_Baixar"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de notícias..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de notícias"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1748,16 +1753,21 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "não foi possível excluir a pasta `%s'."
+
+#: src/folderview.c:2109
 #, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1770,24 +1780,24 @@ msgstr ""
 "\n"
 "Quer realmente apagar?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1796,34 +1806,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -1908,155 +1918,155 @@ msgstr "Criando visualizador de imagem...\n"
 msgid "Can't load the image."
 msgstr "Não foi possível carregar a imagem."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "servidor IMAP4 desabilita LOGIN.\n"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "criando conexão IMAP4 com %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "não posso marcar como apagado: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "não posso fechar pasta\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "não foi possível criar '%s' em baixo da INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não posso criar caixa de correio: LIST falhou\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "não posso criar caixa de correio\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não é possível renomear caixa de correio: %s para %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "não posso apagar caixa de correio\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "não foi possível realizar o parse no envelope: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, 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"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, 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"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "não foi possível anexar a mensagem em %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "o iconv não pode converter UTF-7 para %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -2159,7 +2169,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Próxima"
 
@@ -2379,7 +2389,7 @@ msgstr "Informe a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2503,611 +2513,616 @@ msgstr ""
 "As configurações antigas foram encontradas.\n"
 "Deseja migrar para o novo formato?"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/_Pasta"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/A_pagar pasta"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 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:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arquivo/I_mportar arquivo mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/_Mostrar ou esconder"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/_Mostrar ou esconder/_Árvore de pastas"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/_Mostrar ou esconder/Ver _Mensagens"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 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:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Inglês"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japonês"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Francês"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Limpar todas as mensagens da lixeira?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3117,16 +3132,16 @@ msgstr ""
 "Se uma caixa de correio existente é especificada, ela será\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3136,149 +3151,149 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3439,30 +3454,30 @@ msgstr ""
 "O comando de impressão é inválido:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensagem %s%c%d para %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número no diretório %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3557,81 +3572,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "O comando do visualizador MIME é inválido: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "criando conexão NNTP com %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "A conexão NNTP com %s:%d terminou. Reconectando...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "o artigo %d já está no cache.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "obtendo artigo %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "não foi possível ler o artigo %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "não foi possível obter a lista de grupo de notícias\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "não posso postar artigo.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "não foi possível obter o artigo %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "não foi possível selecionar o grupo: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "intervalo de artigos inválido: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "não há novos artigos.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtendo xover %d - %d en %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "não foi possível obter xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "não foi possível obter xover\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
@@ -5347,17 +5362,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6115,20 +6130,20 @@ msgstr "Construindo a hierarquia..."
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Não."
 
diff --git a/po/ro.po b/po/ro.po
index 5dfbe878..f3bcfe40 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -141,14 +141,14 @@ msgid "Delete account"
 msgstr "Ştergere cont"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Da"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nu"
 
@@ -260,7 +260,7 @@ msgstr "Observaţii"
 msgid "Select Address Book Folder"
 msgstr "Selectaţi un director"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Fişier"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Fişier/---"
 
@@ -333,7 +333,7 @@ msgstr "/_Adresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_tergere"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 #, fuzzy
 msgid "/_Tools"
@@ -343,12 +343,12 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fişier _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
@@ -369,17 +369,17 @@ msgid "/New _Folder"
 msgstr "/_Director nou"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Editare"
 
@@ -401,7 +401,7 @@ msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -579,7 +579,7 @@ msgid "Group"
 msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Director"
 
@@ -654,7 +654,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Niciunul"
 
@@ -666,8 +666,8 @@ msgstr "/_Adăugare..."
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
@@ -712,7 +712,7 @@ msgstr "/_Editare/An_ulare"
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Repetare"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
@@ -721,7 +721,7 @@ msgstr "/_Editare/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Tăiere"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiere"
 
@@ -734,7 +734,7 @@ msgstr "/_Editare/Li_pire"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Select_are tot"
 
@@ -752,7 +752,7 @@ msgstr "/_Editare/Tăie_re linii lungi"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Vedere"
@@ -774,8 +774,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Vedere/_Răspuns"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Vedere/---"
@@ -792,7 +792,7 @@ msgstr "/_Vedere/Ri_glă"
 msgid "/_View/_Attachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vedere/_La"
@@ -804,127 +804,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Mesaj/Set de _caractere/7bit ASCII (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Mesaj/Set de _caractere/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Mesaj/Set de _caractere/Vest European (ISO-8859-_1)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Mesaj/Set de _caractere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Mesaj/Set de _caractere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Mesaj/Set de _caractere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Mesaj/Set de _caractere/Grec (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Mesaj/Set de _caractere/Turcesc (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Mesaj/Set de _caractere/Japonez (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradiţional (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agendă"
@@ -934,14 +934,14 @@ msgstr "/_Utilitare/_Agendă"
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 #, fuzzy
 msgid "/_Tools/---"
@@ -1027,7 +1027,7 @@ msgstr "Compunere mesaj%s"
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Trimitere"
@@ -1129,7 +1129,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -1463,12 +1463,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -1635,174 +1635,179 @@ msgstr "Doriţi suprascrierea fişierului existent ?"
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configuraţie în fişier a eşuat\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 #, fuzzy
 msgid "/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 #, fuzzy
 msgid "/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Căutare _director..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Ştergere _director"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tCăutare mesaje nestocate... "
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nu există mesaje necitite"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/În_scriere la newsgroup"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Şte_rgere newsgroup"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Creare mod vedere director...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Setare informaţii despre director...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1812,16 +1817,21 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Directorul `%s' nu a putut fi creat."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1832,25 +1842,25 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Ştergere director"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, fuzzy, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 #, fuzzy
 msgid "Empty all messages in trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1859,35 +1869,35 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -1972,162 +1982,162 @@ msgstr "Creare vedere imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP4 la %s:%d a fost întreruptă. Reconectare...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creare conexiune IMAP4 la %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "marcajul de ştergere nu a putut fi setat: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "ştergere imposibilă\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "marcajul de ştergere nu a putut fi setat: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Fişierul de marcaje nu a fost găsit.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "a avut loc o eroare la comanda LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "nu poate fi creat %s\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nu poate fi creat %s\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "crearea cutiei poştale a eşuat: LIST a eşuat.\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "crearea cutiei poştale este imposibilă\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "cutia poştală nu a putut fi setată: %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "ştergerea cutiei poştale este imposibilă\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "recepţionarea plicului nu a putut fi realizată\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "a avut loc o eroare în timpul recepţionării plicului.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "plicul nu poate fi analizat: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "spaţiul de nume nu a putut fi obţinut\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificare..."
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Logare IMAP4 eşuată.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu a putut fi adăugat %s la %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Citire director %s ..."
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "mesajul %s nu a putut fi adăugat\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu a putut fi copiat %d la %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -2229,7 +2239,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Înainte"
 
@@ -2453,7 +2463,7 @@ msgstr "Introducere parolă"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2578,723 +2588,728 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 #, fuzzy
 msgid "/_File/_Folder"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 #, fuzzy
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 #, fuzzy
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Redenumire director"
+
+#: src/mainwindow.c:476
 #, fuzzy
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Ştergere _director"
 
 # xxx#
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
 # xxx#
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fişier/_Adăugare cutie poştală..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fişier/Î_nchidere"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Verificare _mesaje noi"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 #, fuzzy
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 #, fuzzy
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fişier/_Importare fişier mbox"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Fişier/Im_primare..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fişier/_Inserare fişier"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Fişier/Ieşi_re"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Select_are tot"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/_Căutare"
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vedere/Bară de _utilitare"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vedere/Bară de _utilitare/Icoane şi te_xt"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vedere/Bară de _utilitare/_Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vedere/Bară de _utilitare/_Icoane"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vedere/Bară de _stare"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vedere/Separare arbore de direct_oare"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/Re_zumat/_Sortare/Sortare după e_xpeditor"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Re_zumat/_Sortare/Sortare după d_imensiune"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/Re_zumat/_Sortare/Sortare după subiect"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/Re_zumat/_Sortare/Sortare după _dată"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Re_zumat/_Sortare/Sortare după _număr"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Re_zumat/_Sortare/_Atracţie după subiect"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Vedere/Vedere _mesaj"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Re_zumat/Selectare elemente afişate..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Vedere/_La"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Vedere/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Re_zumat/Următorul mesaj n_ecitit"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Re_zumat/Mesajul _precedent"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Re_zumat/Mesajul _următor"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vedere/Separare arbore de m_esaje"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr ""
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr ""
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Re_zumat/Alt di_rector"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Mesaj/Set de _caractere/Detectare _automată"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Message/Set de _caractere/Japonez (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Message/Set de _caractere/Japonez (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Message/Set de _caractere/Japonez (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere în _fereastră nouă"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Show all _header"
 msgstr "/_Afişare antet"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesa_jele din lista de aşteptare"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compunere mesaj _nou"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/_Răspuns"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la toţi"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Î_naintare"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 #, fuzzy
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Şter_gere"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marcare"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarcare"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 #, fuzzy
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 #, fuzzy
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Recepţ_ionare poştă"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 #, fuzzy
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Utilitare/_Agendă"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Re_zumat/Ştergere mesaje _duplicate"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/E_xecutare"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Utilitare/Fereastră _jurnal"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Configuraţie"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraţie/Preferinţe _comune..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 #, fuzzy
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Configuraţie/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraţie/_Preferinţe per cont..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraţie/Creare cont _nou..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraţie/_Editare conturi..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraţie/_Selectare cont curent"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/A_jutor/_Despre"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3304,16 +3319,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3323,155 +3338,155 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 msgid "Set as junk mail"
 msgstr ""
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -3637,30 +3652,30 @@ msgstr ""
 "Linia de comandă pentru imprimare este invalidă:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "copierea mesajului %s în %s a eşuat\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Deschiderea fişierului marcaj este imposibilă.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "directorul sursă este identic cu cel destinaţie.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimul număr din directorul %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3759,83 +3774,83 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Linia de comanda pentru vizualizare MIME este invalidă: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creare conexiune NNTP la %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea NNTP la %s:%d a fost întreruptă. Reconectare...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "Articolul %d a fost deja stocat.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "Receptionare articol %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "articolul %d nu poate fi citit\n"
 
-#: src/news.c:547
+#: src/news.c:548
 #, fuzzy
 msgid "can't retrieve newsgroup list\n"
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "postarea articolului este imposibilă.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "articolul %d nu poate fi recepţionat\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "grupul nu poate fi setat: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "interval invalid: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "nu există articole noi.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "executare xover %d - %d în %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "xover imposibil\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linie xover invalidă: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 #, fuzzy
 msgid "can't get xhdr\n"
 msgstr "xover imposibil\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 #, fuzzy
 msgid "error occurred while getting xhdr.\n"
 msgstr "a avut loc o eroare în timpul execuţiei xover.\n"
@@ -5621,17 +5636,17 @@ msgid "Attachment"
 msgstr "Ataşamente"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "De la"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Data"
 
@@ -6461,20 +6476,20 @@ msgstr "Construire fire de discuţie..."
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "mesajul %d a fost deja stocat.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nu."
 
@@ -7140,9 +7155,6 @@ msgstr "scrierea în %s a eşuat.\n"
 #~ msgid "/_Scoring..."
 #~ msgstr "/S_coruri..."
 
-#~ msgid "/_Search folder..."
-#~ msgstr "/Căutare _director..."
-
 #~ msgid "/S_coring..."
 #~ msgstr "/S_coruri..."
 
diff --git a/po/ru.po b/po/ru.po
index a28aa986..56c49656 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -138,14 +138,14 @@ msgid "Delete account"
 msgstr "Удалить учетную запись"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Да"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Нет"
 
@@ -262,7 +262,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Файл"
@@ -284,9 +284,9 @@ msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -334,7 +334,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -343,12 +343,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -366,17 +366,17 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Правка"
 
@@ -398,7 +398,7 @@ msgstr "Имя:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -574,7 +574,7 @@ msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Папка"
 
@@ -649,7 +649,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Нет"
 
@@ -661,8 +661,8 @@ msgstr "/Добавить..."
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
@@ -702,7 +702,7 @@ msgstr "/Правка/Откат"
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Правка/---"
@@ -711,7 +711,7 @@ msgstr "/Правка/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
@@ -723,7 +723,7 @@ msgstr "/Правка/Вставить"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
@@ -739,7 +739,7 @@ msgstr "/Правка/Отформатировать все сообщение"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вид"
@@ -761,8 +761,8 @@ msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Вид/---"
@@ -779,7 +779,7 @@ msgstr "/Вид/Линейка"
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Сортировка/По убыванию"
@@ -791,127 +791,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Балтийская (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллическая (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Русская (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Украинская (KOI8-_U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллическая _Win (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Упрощенная китайская (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Традиционная китайская (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Традиционная китайская (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
@@ -919,13 +919,13 @@ msgstr "/Инструменты/Адресная книга"
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
@@ -1006,7 +1006,7 @@ msgstr "Подготовка сообщения%s"
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Отправить"
@@ -1110,7 +1110,7 @@ msgstr "Тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Размер"
 
@@ -1441,12 +1441,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -1612,160 +1612,165 @@ msgstr "Переписать существующий файл?"
 msgid "failed to write configuration to file\n"
 msgstr "ошибка записи настроек в файл\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Создать новую папку..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Переименовать папку..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Удалить папку"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Очистить корзину"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Проверить новые сообщения"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Перестроить дерево папок"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Поиск сообщений..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Загрузить"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Подписка на группу новостей..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Удалить группу новостей"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Непрочитанные"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1775,16 +1780,21 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Ошибка при удалении папки '%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1795,24 +1805,24 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1821,34 +1831,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -1933,156 +1943,156 @@ msgstr "Создание области просмотра изображени�
 msgid "Can't load the image."
 msgstr "Ошибка загрузки изображения"
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Соединение IMAP4 с %s прервано. Восстановление соединения...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Каталог сервера IMAP4"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "установление соединения IMAP4 с %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Не удалось начать сеанс TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не удалось установить флаг удаления: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "не удалось очистить папку от удаленных сообщений\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не удалось установить флаг удаления: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "невозможно закрыть папку\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "произошла ошибка при получении LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ошибка при создании '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ошибка при создании '%s' внутри INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удается создать почтовый ящик: ошибка LIST\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "не удается создать почтовый ящик\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удается переименовать почтовый ящик %s в %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "не удается удалить почтовый ящик\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "не удалось получить данные конверта\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "ошибка при получении данных конверта.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имен\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -2184,7 +2194,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Далее"
 
@@ -2404,7 +2414,7 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2528,622 +2538,627 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Создать новую папку..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/Файл/Папка/Переименовать папку..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Удалить папку"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Почтовый ящик"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Почтовый ящик/Добавить почтовый ящик..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Почтовый ящик/Удалить почтовый ящик"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Почтовый ящик/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения во всех папках"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Почтовый ящик/Перестроить дерево папок"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Импорт mbox-файла..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Экспорт в mbox-файл..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/Файл/Работать автономно"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/Файл/Выход"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Правка/Поиск сообщений..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/Вид/Показать или скрыть"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вид/Показать или скрыть/Дерево папок"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вид/Показать или скрыть/Область просмотра"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вид/Показать или скрыть/Панель инструментов"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы и текст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Пиктограммы"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельная область просмотра"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Вид/Показать все заголовки"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учетных записей"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/Инструменты/Выполнить"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учетной записи... "
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учетную запись..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учетных записей..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учетную запись"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Удалить все сообщения из всех корзин?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3153,16 +3168,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3172,151 +3187,151 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3478,30 +3493,30 @@ msgstr ""
 "Неправильная команда печати:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Последний номер в каталоге %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3599,81 +3614,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Неверная команда просмотра MIME: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "соединение NNTP с %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Потеряно соединение NNTP с %s:%d. Попытка восстановления...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статья %d уже в кеше.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "получение статьи %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ошибка чтения статьи %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ошибка получения списка групп новостей\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "ошибка отправки статьи.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ошибка получения статьи %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не удалось выбрать группу: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неверный диапазон статей: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "новых статей нет.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "загрузка xover %d - %d в %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "не удалось загрузить xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "произошла ошибка при получении xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "неверная строка xover: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "не удалось загрузить xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "произошла ошибка при получении xhdr.\n"
 
@@ -5408,17 +5423,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Дата"
 
@@ -6175,20 +6190,20 @@ msgstr "Связывание обсуждений..."
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Номер"
 
diff --git a/po/sk.po b/po/sk.po
index 4df61cdd..51c720f2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Zmazať konto"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Áno"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nie"
 
@@ -260,7 +260,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Súbor"
@@ -282,9 +282,9 @@ msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
@@ -332,7 +332,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -341,12 +341,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -364,17 +364,17 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
@@ -396,7 +396,7 @@ msgstr "Meno:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -573,7 +573,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -648,7 +648,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Žiadna"
 
@@ -660,8 +660,8 @@ msgstr "/_Pridať..."
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -705,7 +705,7 @@ msgstr "/Úp_ravy"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -714,7 +714,7 @@ msgstr "/Úp_ravy/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
@@ -726,7 +726,7 @@ msgstr "/Úp_ravy/_Prilepiť"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
@@ -743,7 +743,7 @@ msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Zobraziť"
@@ -765,8 +765,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
@@ -783,7 +783,7 @@ msgstr "/_Zobraziť/P_ravítko"
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
@@ -795,127 +795,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
@@ -923,13 +923,13 @@ msgstr "/_Nástroje/_Adresár"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1013,7 +1013,7 @@ msgstr "Písanie správy%s"
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Odoslať"
@@ -1117,7 +1117,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -1449,12 +1449,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -1620,162 +1620,167 @@ msgstr "Prepísať existujúci súbor?"
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Premenovať priečinok..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Vy_hľadať v správach..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žiadne neprečítané správy."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1785,16 +1790,21 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Priečinok '%s' sa nedá odstrániť."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1805,24 +1815,24 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1831,34 +1841,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -1943,156 +1953,156 @@ msgstr "Vytváram náhľad obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nedá sa načítať obrázok."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Priečinok serveru IMAP"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -2194,7 +2204,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2416,7 +2426,7 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2541,634 +2551,639 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, 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:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 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:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3178,16 +3193,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3197,153 +3212,153 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3504,30 +3519,30 @@ msgstr ""
 "Príkazový riadok tlače je neplatný:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nemôžem kopírovať správu %s do %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Nemôžem označiť súbor so značkami.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posledné číslo v priečinku %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3625,81 +3640,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP spojenie k %s:%d bolo prerušené. Obnovujem spojenie...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "článok %d už je v medzipamäti.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "prijímam článok %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "nemôžem prečítať článok %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "nemôžem získať zoznam diskusných skupín\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "nemôžem odoslať článok.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "nemôžem prijať článok %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "nemôžem vybrať skupinu %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "žiadne nové články.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "nemôžem prijať xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "pri prijímaní xover sa vyskytla chyba.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "nemôžem prijať xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
 
@@ -5459,17 +5474,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Dátum"
 
@@ -6229,20 +6244,20 @@ msgstr "Vytváram vlákna..."
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Č."
 
diff --git a/po/sl.po b/po/sl.po
index d5544b7a..2e5f8e75 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Brisanje računa"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Da"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ne"
 
@@ -258,7 +258,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -330,7 +330,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -339,12 +339,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
@@ -394,7 +394,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -570,7 +570,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Mapa"
 
@@ -645,7 +645,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Nič"
 
@@ -657,8 +657,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -703,7 +703,7 @@ msgstr "/_Uredi/_Razveljavi"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -712,7 +712,7 @@ msgstr "/_Uredi/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
@@ -724,7 +724,7 @@ msgstr "/_Uredi/_Prilepi"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
@@ -741,7 +741,7 @@ msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pogled"
@@ -763,8 +763,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pogled/---"
@@ -781,7 +781,7 @@ msgstr "/_Pogled/R_avnilo"
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
@@ -793,127 +793,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
@@ -921,13 +921,13 @@ msgstr "/_Orodja/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
@@ -1011,7 +1011,7 @@ msgstr "Sestavi sporočilo%s"
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Pošlji"
@@ -1114,7 +1114,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Velikost"
 
@@ -1446,12 +1446,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -1616,163 +1616,168 @@ msgstr "Naj povozim obstoječo datoteko"
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/P_reimenuj mapo..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/I_zbriši mapo..."
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporočil..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporočil."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novičarsko skupino..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, 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:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1782,16 +1787,21 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Ne morem odstraniti mape '%s'"
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1802,24 +1812,24 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1828,34 +1838,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -1940,161 +1950,161 @@ msgstr "Delam gledanje slike...\n"
 msgid "Can't load the image."
 msgstr "Ne morem naložiti slike."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Imenik strežnika IMAP"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pričeti seje TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne morem preimenovati poštnega predala: %s v %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -2196,7 +2206,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2413,7 +2423,7 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2536,641 +2546,646 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Pokaži vsa _zaglavja"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3180,16 +3195,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3198,153 +3213,153 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3505,30 +3520,30 @@ msgstr ""
 "Ukazna vrstica za tiskanje je neveljavna:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti označene datoteke.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Zadnja številka v imeniku %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3626,81 +3641,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "ustvarjam povezavo NNTP do %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "Povezava NNTP do %s:%d je bila prekinjena. Povezujem se znova...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članek %d je že v predpomnilniku.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "sprejemam članek %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne morem prebrati članka %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne morem sprejeti seznama novičarskih skupin\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "ne morem poslati članka.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne morem sprejeti članka %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne morem izbrati skupine %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neveljavno območje člankov: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "ni novih člankov.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "sprejemam xover %d - %d v %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "ne morem prejeti xoverja\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "med prejemanjem xoverja je prišlo do napake.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "ne morem prejeti xhdr-ja\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "med prejemanjem xhdr-ja je prišlo do napake.\n"
 
@@ -5462,17 +5477,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6232,20 +6247,20 @@ msgstr "Gradim niti..."
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/sr.po b/po/sr.po
index 0d761666..9a5db469 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -136,14 +136,14 @@ msgid "Delete account"
 msgstr "Obriši nalog"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Da"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Ne"
 
@@ -258,7 +258,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
@@ -330,7 +330,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -339,12 +339,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
@@ -394,7 +394,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -564,7 +564,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -639,7 +639,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ništa"
 
@@ -651,8 +651,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -697,7 +697,7 @@ msgstr "/_Izmeni/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
@@ -706,7 +706,7 @@ msgstr "/_Izmeni/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
@@ -718,7 +718,7 @@ msgstr "/_Izmeni/U_baci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
@@ -735,7 +735,7 @@ msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pregled"
@@ -757,8 +757,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pregled/---"
@@ -775,7 +775,7 @@ msgstr "/_Pregled/Len_jir"
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
@@ -787,127 +787,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
@@ -915,13 +915,13 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
@@ -1005,7 +1005,7 @@ msgstr "Pisanje poruke%s"
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Pošalji"
@@ -1109,7 +1109,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Veličina"
 
@@ -1441,12 +1441,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -1611,163 +1611,168 @@ msgstr "Prepisati postojeću datoteku?"
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, 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:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/P_reimenuj direktorijum..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, 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:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1777,16 +1782,21 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Ne mogu da premestim direktorijum `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1797,24 +1807,24 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1823,34 +1833,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -1935,161 +1945,161 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorijum IMAP servera"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sanduče\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu promeniti ime sandučeta %s u %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sanduče\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobijanja omota.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -2191,7 +2201,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Sled."
 
@@ -2408,7 +2418,7 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2531,642 +2541,647 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Direktorijum/Kreiraj _novi direktorijum..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Direktorijum/_Obriši direktorijum"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Proveri nove poruke u svim direktorijumima"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unos mbox datoteku..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Izmene/_Traži poruke..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži ili s_kloni"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Drvo direktorijuma"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Pregled poruka"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka za alat"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prikaži kompletno _zaglavlje"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvrši"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3176,16 +3191,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3194,153 +3209,153 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3501,30 +3516,30 @@ msgstr ""
 "Naredba za štampanje je pogrešna:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Posednji broj u direktoriju %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3622,81 +3637,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME nije ispravna: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "uspostavljam NNTP vezu sa %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP veza sa %s:%d je prekinuta. Povezujem se ponovo...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "članak %d već je pohranjen.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "primam članak %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "ne mogu pročitati članak %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "ne mogu primiti listu news grupa\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "ne mogu poslati članak.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "ne mogu primiti članak %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, fuzzy, c-format
 msgid "can't select group: %s\n"
 msgstr "ne mogu odabrati grupu %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "pogrešan opseg članaka: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "nema novih članaka.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "primam xover %d - %d u %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "ne mogu primiti xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "došlo je do greške prilikom primanja xovera.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "ne mogu dobiti xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "došlo je do greške prilikom primanja xhdra.\n"
 
@@ -5457,17 +5472,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6229,20 +6244,20 @@ msgstr "Izgrađivanje stabla..."
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Ne."
 
diff --git a/po/sv.po b/po/sv.po
index 1959180c..80c6c103 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -138,14 +138,14 @@ msgid "Delete account"
 msgstr "Ta bort konto"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Ja"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Nej"
 
@@ -262,7 +262,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -284,9 +284,9 @@ msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
@@ -334,7 +334,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -343,12 +343,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -366,17 +366,17 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Redigera"
 
@@ -398,7 +398,7 @@ msgstr "Namn:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -570,7 +570,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Mapp"
 
@@ -645,7 +645,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ingen"
 
@@ -657,8 +657,8 @@ msgstr "/_Lägg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -698,7 +698,7 @@ msgstr "/_Redigera/_Ångra"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
@@ -707,7 +707,7 @@ msgstr "/_Redigera/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
@@ -719,7 +719,7 @@ msgstr "/_Redigera/Klistra _in"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
@@ -735,7 +735,7 @@ msgstr "/_Redigera/Bryt _långa rader"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Visa"
@@ -757,8 +757,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Visa/---"
@@ -775,7 +775,7 @@ msgstr "/_Visa/_Linjal"
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Sortera/Nedstigande"
@@ -787,127 +787,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Kodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Kodning/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Kodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Kodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Kodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Kodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Kodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Kodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Kodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Kodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Kodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Kodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Kodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Kodning/Thai (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Kodning/Thai (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
@@ -915,13 +915,13 @@ msgstr "/V_erktyg/_Adressbok"
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
@@ -1002,7 +1002,7 @@ msgstr "Skriv meddelande%s"
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Skicka"
@@ -1107,7 +1107,7 @@ msgstr "MIME-typ"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Storlek"
 
@@ -1438,12 +1438,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -1608,160 +1608,165 @@ msgstr "Skriv över befintlig fil?"
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/_Byt namn..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Töm _papperskorgen"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mappträd"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/_Sök meddelanden..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/_Hämta"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera på _diskussionsgrupp"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1771,16 +1776,21 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Kan inte ta bort mappen \"%s\"."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1791,24 +1801,24 @@ msgstr ""
 "Alla mappar och meddelanden under \"%s\" kommer att tas bort.\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Töm alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1817,34 +1827,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -1929,156 +1939,156 @@ msgstr "Skapar bildvy...\n"
 msgid "Can't load the image."
 msgstr "Kan inte öppna bilden."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-servermapp"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte byta namn på brevlåda %s till %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -2180,7 +2190,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Nästa"
 
@@ -2400,7 +2410,7 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2523,622 +2533,627 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Arkiv/_Mapp/_Byt namn..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 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:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/_Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Kodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Kodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Kodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Kodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Kodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Kodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_ken"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Töm alla meddelanden i alla papperskorgar?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3148,16 +3163,16 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3166,150 +3181,150 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Använd som förvalt konto"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 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:2530
+#: src/mainwindow.c:2538
 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:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3470,30 +3485,30 @@ msgstr ""
 "Utskriftskommandot är felaktigt:\n"
 "\"%s\""
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Sista tal i mapp %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3591,81 +3606,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME-visningskommandot är felaktigt:\"%s\""
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "skapar NNTP-förbindelse till %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "NNTP-förbindelse till %s:%d har avbrutits. Återuppkopplar...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "inlägget %d har redan cachats.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "hämtar inlägg %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "kan inte läsa inlägg %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "kan inte hämta diskussionsgruppslistan\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "kan inte posta inlägg.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "kan inte hämta inlägg %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "kan inte välja grupp %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "felaktigt inläggsomfång: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "inga nya inlägg.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "hämtar xover %d - %d i %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "kan inte hämta xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "fel uppstod vid hämtning av xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "felaktig xover-rad: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "kan inte hämta xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "fel uppstod vid hämtning av xhdr.\n"
 
@@ -5401,17 +5416,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Datum"
 
@@ -6168,20 +6183,20 @@ msgstr "Skapar trådar..."
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Nr."
 
diff --git a/po/tr.po b/po/tr.po
index c98c246c..4594cbac 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -139,14 +139,14 @@ msgid "Delete account"
 msgstr "Hesabı sil"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Evet"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Hayır"
 
@@ -263,7 +263,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Dosya"
@@ -285,9 +285,9 @@ msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
@@ -335,7 +335,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -344,12 +344,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -367,17 +367,17 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
@@ -399,7 +399,7 @@ msgstr "İsim:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -574,7 +574,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Dizin"
 
@@ -649,7 +649,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -661,8 +661,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
@@ -702,7 +702,7 @@ msgstr "/Dü_zenle/_Geri al"
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
@@ -711,7 +711,7 @@ msgstr "/Dü_zenle/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
@@ -723,7 +723,7 @@ msgstr "/Dü_zenle/_Yapıştır"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
@@ -739,7 +739,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:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Görünüm"
@@ -761,8 +761,8 @@ msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
@@ -779,7 +779,7 @@ msgstr "/_Görünüm/_Cetvel"
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
@@ -791,127 +791,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, 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:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
@@ -919,13 +919,13 @@ msgstr "/A_raçlar/_Adres defteri"
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
@@ -1006,7 +1006,7 @@ msgstr "İleti düzenle (%s)"
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Gönder"
@@ -1110,7 +1110,7 @@ msgstr "MIME türü"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Boyut"
 
@@ -1442,12 +1442,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -1612,160 +1612,165 @@ msgstr "Şimdiki dosyanın üzerine yazılsın mı?"
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/D_izinin adını değiştir"
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/Çö_pü boşalt"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin ağacını _yeniden yarat"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/İ_letilerda ara..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/İ_ndir"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna üye ol..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1775,16 +1780,21 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "`%s' dizini silinemiyor."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1795,24 +1805,24 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1821,34 +1831,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -1933,156 +1943,156 @@ msgstr "Resim görüntüsü oluşturuluyor...\n"
 msgid "Can't load the image."
 msgstr "Resim yüklenemedi."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP sunucu dizini"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna bağlantı kurulamadı.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen altında oluşturulamadı\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun adı %s olarak değiştirilemedi \n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -2184,7 +2194,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2404,7 +2414,7 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2527,623 +2537,628 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/_Dosya/D_izin"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni mesajlar için k_ontrol et"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 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:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Dosya/_Posta kutusu dosyasına gönder..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Gü_ncel iletide bul..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 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:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 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:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 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:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/_Sırala"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/_Sırala/Artan sırala"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git/"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/Gi_t/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/Gi_t/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/Gi_t/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/_Görünüm/Tüm _başlıkları görüntüle"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 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:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/A_raçlar/Ç_alıştır"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, 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:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, 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:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3153,16 +3168,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3171,150 +3186,150 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 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:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3476,30 +3491,30 @@ msgstr ""
 "Yazdırma komutu hatalı:\n"
 "'%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Dizindeki son numara %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3597,81 +3612,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "%s:%d adresine NNTP bağlantısı yapılıyor...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "%s:%d konumuna yapılan NNTP bağlantısı koptu.Yeniden bağlanılıyor...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "%d iletisi zaten önbelleklendi.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "%d. makale alınıyor...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "%d. makale okunamadı\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "haber grubu listesi alınamıyor\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "makale postalanamıyor.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "makale alınamıyor : %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "grup seçilemiyor: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "geçersiz makale aralığı: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "yeni makale yok.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "%d - %d haber grubu alınıyor (%s)...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "haber grupları alınamadı\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "haber grupları alınırken hata.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "hatalı haber grubu satırı %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "X başlıkları alınamıyor\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "x başlıkları alınırken hata oluştu.\n"
 
@@ -5406,17 +5421,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Tarih"
 
@@ -6171,20 +6186,20 @@ msgstr "Konumlar oluşturuluyor..."
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Hayır."
 
diff --git a/po/uk.po b/po/uk.po
index 7a9f18c3..f52ca22b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -139,14 +139,14 @@ msgid "Delete account"
 msgstr "Видалити обліковий запис"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "Авжеж"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+Нізащо"
 
@@ -263,7 +263,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/Файл"
@@ -285,9 +285,9 @@ msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/Файл/---"
 
@@ -335,7 +335,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -344,12 +344,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -367,17 +367,17 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/Редагувати"
 
@@ -399,7 +399,7 @@ msgstr "Ім'я:"
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -569,7 +569,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "Папка"
 
@@ -644,7 +644,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "Ніякий"
 
@@ -656,8 +656,8 @@ msgstr "/Додати..."
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
@@ -697,7 +697,7 @@ msgstr "/Редагувати/Undo"
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
@@ -706,7 +706,7 @@ msgstr "/Редагувати/---"
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
@@ -718,7 +718,7 @@ msgstr "/Редагувати/Вставити"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
@@ -734,7 +734,7 @@ msgstr "/Редагувати/Згорнути всі довгі рядки"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/Вигляд"
@@ -756,8 +756,8 @@ msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/Вигляд/---"
@@ -774,7 +774,7 @@ msgstr "/Вигляд/Лінійка"
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Сортувати/За спаданням"
@@ -786,127 +786,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
@@ -914,13 +914,13 @@ msgstr "/Інструменти/Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
@@ -1001,7 +1001,7 @@ msgstr "Створити лист%s"
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "Послати"
@@ -1105,7 +1105,7 @@ msgstr "тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Розмір"
 
@@ -1436,12 +1436,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -1606,161 +1606,166 @@ msgstr "Писати поверх існуючого файла?"
 msgid "failed to write configuration to file\n"
 msgstr "не вдалось записати конфігурацію в файл\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/Створити нову папку..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/Перейменувати папку..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/Перейменувати папку..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/Видалити папку"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/Шукати листи..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/Завантажити"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Передплатити конференцію"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/Видалити конференцію"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1770,16 +1775,21 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "Не вдалось видалити папку `%s'."
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1790,24 +1800,24 @@ msgstr ""
 "Всі папки і листи в `%s' буде видалено.\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1816,34 +1826,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -1928,156 +1938,156 @@ msgstr "Створюємо область перегляду зображенн�
 msgid "Can't load the image."
 msgstr "Не вдалось завантажити зображення."
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "З'єднання IMAP4 до %s втрачено. Відновлюємо...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Каталог сервера IMAP"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "створення з'єднання INAP4 до %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "Не вдалось почати сесію TLS.\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалось встановити прапорець видалення: %s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "не вдалось очистити папку від видалених листів\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалось встановити прапорець видалення: 1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "не вдалось закрити папку\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалось створити '%s'\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалось створити '%s' всередині INBOX\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалось створити скриньку: невдача LIST\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "не вдалось створити скриньку\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалось перейменувати скриньку: %s на %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "не вдалось видалити скриньку\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилась помилка при отриманні конверта.\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -2179,7 +2189,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "Далі"
 
@@ -2399,7 +2409,7 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2522,632 +2532,637 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/Файл/Папка/Перейменувати..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити папку"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Додати скриньку..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Видалити скриньку"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Папка/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Папка/Перевірити за новими листами у всіх папках"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Імпортувати файл mbox"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Експортувати в файл mbox..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити кошик"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук листів..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/Вигляд/Показати весь заголовок"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/Інструменти/Виконати"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Спорожнити кошик"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3157,16 +3172,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3176,150 +3191,150 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Встановити як default"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3480,30 +3495,30 @@ msgstr ""
 "Командний рядок друку непридатний:\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "Не вдалось відкрити файл позначок.\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копіюємо лист %s%c%d в %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "Останній номер в каталозі %s = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3601,81 +3616,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командний рядок переглядача MIME невірний: `%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "створюємо з'єднання NNTP до %s:%d ...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "З'єднання NNTP до %s:%d було розірвано. Відновлюємо...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "статтю %d вже кешовано.\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "отримуємо статтю %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "не вдалось прочитати статтю %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "не вдалось отримати список конференцій\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "не вдалось послати статтю.\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "не вдалось отримати статтю %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "не вдалось обрати конференцію: %s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "невірний діапазон статей: %d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "нових статтей нема.\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "отримуємо xover %d - %d в %s...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "не вдалось отримати xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "трапилась помилка при отриманні xover.\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "невірний рядок xover: %s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "не вдалось отримати xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "трапилась помилка при отриманні xhdr.\n"
 
@@ -5411,17 +5426,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "Дата"
 
@@ -6179,20 +6194,20 @@ msgstr "Будуємо нитки обговорення..."
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "Номер"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 00569795..c2fee6a9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+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"
@@ -134,14 +134,14 @@ msgid "Delete account"
 msgstr "删除帐号"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "是"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+否"
 
@@ -258,7 +258,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -280,9 +280,9 @@ msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
@@ -330,7 +330,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -339,12 +339,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -362,17 +362,17 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
@@ -394,7 +394,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -561,7 +561,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "文件夹"
 
@@ -636,7 +636,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "没有"
 
@@ -648,8 +648,8 @@ msgstr "/添加(_A)..."
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
@@ -689,7 +689,7 @@ msgstr "/编辑(_E)/撤销(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
@@ -698,7 +698,7 @@ msgstr "/编辑(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
@@ -710,7 +710,7 @@ msgstr "/编辑(_E)/粘贴(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
@@ -726,7 +726,7 @@ msgstr "/编辑(_E)/所有长行折行(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/查看(_V)"
@@ -748,8 +748,8 @@ msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
@@ -766,7 +766,7 @@ msgstr "/查看(_V)/标尺(_U)"
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
@@ -777,106 +777,106 @@ msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -884,13 +884,13 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
@@ -971,7 +971,7 @@ msgstr "撰写邮件%s"
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "发送"
@@ -1074,7 +1074,7 @@ msgstr "MIME 类型"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "大小"
 
@@ -1404,12 +1404,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -1574,160 +1574,165 @@ msgstr "覆盖已存在的文件？"
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_N)..."
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/重命名文件夹(_R)..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/删除文件夹(_D)"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/清空废件箱(_T)"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/重建文件夹树(_E)"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/查找邮件(_S)..."
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/下载(_L)"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/订阅新闻组(_B)..."
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/删除新闻组(_R)"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1737,16 +1742,21 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "无法删除文件夹“%s”。"
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1757,24 +1767,24 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1783,34 +1793,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -1895,156 +1905,156 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 服务器目录"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -2146,7 +2156,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "下一个"
 
@@ -2366,7 +2376,7 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2489,616 +2499,621 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox文件(_I)..."
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/导出到mbox文件(_E)..."
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_X)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/查找邮件(_S)..."
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "清空所有废件箱里的信件？"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3107,16 +3122,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3125,150 +3140,150 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3429,30 +3444,30 @@ msgstr ""
 "打印命令行无效：\n"
 "“%s”"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "无法打开标记文件。\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "目录 %s 的最后一个序号 = %d\n"
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3547,81 +3562,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME察看器命令行无效：“%s”"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的NNTP连接...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的NNTP连接已断开。正在重新连接...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "文章 %d 已被缓存。\n"
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr "正在下载文章 %d...\n"
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "无法读取文章 %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "无法获取新闻组列表\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "无法发表文章。\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法获取文章 %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择组：%s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效的文章范围：%d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "没有新文章。\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "无法获取 xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "获取 xover 时发生错误。\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "无效的 xover 行：%s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "无法获取 xhdr\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "获取 xhdr 时发生错误。\n"
 
@@ -5338,17 +5353,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "日期"
 
@@ -6105,20 +6120,20 @@ msgstr "正在创建线索..."
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr "No."
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index e8a16102..dc5cedf0 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-30 14:43+0900\n"
+"POT-Creation-Date: 2005-07-01 19:19+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -121,14 +121,14 @@ msgid "Delete account"
 msgstr "刪除帳號"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "Yes"
 msgstr "是的"
 
 #: src/account.c:815 src/compose.c:2675 src/compose.c:2746 src/compose.c:5119
-#: src/folderview.c:2052 src/folderview.c:2148 src/folderview.c:2194
-#: src/folderview.c:2336 src/folderview.c:2382
+#: src/folderview.c:2113 src/folderview.c:2209 src/folderview.c:2255
+#: src/folderview.c:2397 src/folderview.c:2443
 msgid "+No"
 msgstr "+不要"
 
@@ -245,7 +245,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇位址簿資料夾"
 
-#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:467
+#: src/addressbook.c:336 src/compose.c:490 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -267,9 +267,9 @@ msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
 #: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:495
-#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:484
-#: src/mainwindow.c:487 src/mainwindow.c:489 src/mainwindow.c:492
-#: src/mainwindow.c:494 src/messageview.c:140
+#: src/compose.c:500 src/compose.c:504 src/mainwindow.c:488
+#: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
+#: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
@@ -317,7 +317,7 @@ msgstr "/位址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/位址(_A)/刪除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:614 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -326,12 +326,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:627 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:628 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -349,17 +349,17 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:484
-#: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
-#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
-#: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:376 src/summaryview.c:380
+#: src/folderview.c:234 src/folderview.c:236 src/folderview.c:240
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:254
+#: src/folderview.c:258 src/folderview.c:268 src/folderview.c:270
+#: src/folderview.c:273 src/summaryview.c:376 src/summaryview.c:380
 #: src/summaryview.c:384 src/summaryview.c:394 src/summaryview.c:396
 #: src/summaryview.c:399 src/summaryview.c:405
 msgid "/---"
 msgstr "/---"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:507
-#: src/mainwindow.c:498 src/messageview.c:143
+#: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
@@ -381,7 +381,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2285
+#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2293
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -552,7 +552,7 @@ msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3135 src/folderview.c:339 src/prefs_account.c:1862
+#: src/addressbook.c:3135 src/folderview.c:344 src/prefs_account.c:1862
 msgid "Folder"
 msgstr "資料夾"
 
@@ -627,7 +627,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4059
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4064
 msgid "None"
 msgstr "無"
 
@@ -639,8 +639,8 @@ msgstr "/新增...(_A)"
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:485 src/folderview.c:237 src/folderview.c:255
-#: src/folderview.c:270
+#: src/compose.c:485 src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:275
 msgid "/_Properties..."
 msgstr "/內容...(_P)"
 
@@ -680,7 +680,7 @@ msgstr "/編輯(_E)/復原(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:502
+#: src/compose.c:510 src/compose.c:517 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
@@ -689,7 +689,7 @@ msgstr "/編輯(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_t)"
 
-#: src/compose.c:512 src/mainwindow.c:499 src/messageview.c:144
+#: src/compose.c:512 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
@@ -701,7 +701,7 @@ msgstr "/編輯(_E)/貼上(_P)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_q)"
 
-#: src/compose.c:516 src/mainwindow.c:500 src/messageview.c:145
+#: src/compose.c:516 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_a)"
 
@@ -717,7 +717,7 @@ msgstr "/編輯(_E)/將所有過長的行折行(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動換行(_o)"
 
-#: src/compose.c:523 src/mainwindow.c:507 src/messageview.c:150
+#: src/compose.c:523 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/顯示(_V)"
@@ -739,8 +739,8 @@ msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
 #: src/compose.c:528 src/compose.c:530 src/compose.c:532 src/compose.c:534
-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:554
-#: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
+#: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
@@ -757,7 +757,7 @@ msgstr "/顯示(_V)/尺規(_u)"
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:540 src/mainwindow.c:585 src/messageview.c:157
+#: src/compose.c:540 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
@@ -769,127 +769,127 @@ msgstr ""
 #: src/compose.c:543 src/compose.c:549 src/compose.c:555 src/compose.c:559
 #: src/compose.c:565 src/compose.c:569 src/compose.c:575 src/compose.c:579
 #: src/compose.c:589 src/compose.c:593 src/compose.c:603 src/compose.c:607
-#: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:153
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/compose.c:545 src/mainwindow.c:589 src/messageview.c:161
+#: src/compose.c:545 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字集(_C)/7位元 ASCII 字集(US-ASC_II)"
 
-#: src/compose.c:547 src/mainwindow.c:591 src/messageview.c:164
+#: src/compose.c:547 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字集(_C)/Unicode (_UTF-8)"
 
-#: src/compose.c:551 src/mainwindow.c:595 src/messageview.c:167
+#: src/compose.c:551 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:553 src/mainwindow.c:597 src/messageview.c:169
+#: src/compose.c:553 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字集(_C)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:557 src/mainwindow.c:601 src/messageview.c:172
+#: src/compose.c:557 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字集(_C)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:561 src/mainwindow.c:605 src/messageview.c:175
+#: src/compose.c:561 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字集(_C)/_波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:563 src/mainwindow.c:607 src/messageview.c:177
+#: src/compose.c:563 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字集(_C)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:567 src/mainwindow.c:611 src/messageview.c:180
+#: src/compose.c:567 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:571 src/mainwindow.c:615 src/messageview.c:183
+#: src/compose.c:571 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字集(_C)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:573 src/mainwindow.c:617 src/messageview.c:185
+#: src/compose.c:573 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:577 src/mainwindow.c:621 src/messageview.c:188
+#: src/compose.c:577 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字集(_C)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:581 src/mainwindow.c:625 src/messageview.c:191
+#: src/compose.c:581 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:583 src/mainwindow.c:627 src/messageview.c:193
+#: src/compose.c:583 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:585 src/mainwindow.c:629 src/messageview.c:195
+#: src/compose.c:585 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:587 src/mainwindow.c:631 src/messageview.c:197
+#: src/compose.c:587 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字集(_C)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:591 src/mainwindow.c:635 src/messageview.c:200
+#: src/compose.c:591 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:595 src/mainwindow.c:645 src/messageview.c:209
+#: src/compose.c:595 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:597 src/mainwindow.c:647 src/messageview.c:211
+#: src/compose.c:597 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字集(_C)/簡體中文 (_GB2312)"
 
-#: src/compose.c:599 src/mainwindow.c:649 src/messageview.c:213
+#: src/compose.c:599 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (_Big5)"
 
-#: src/compose.c:601 src/mainwindow.c:651 src/messageview.c:215
+#: src/compose.c:601 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字集(_C)/繁體中文 (EUC-_TW)"
 
-#: src/compose.c:605 src/mainwindow.c:657 src/messageview.c:220
+#: src/compose.c:605 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (EUC-_KR)"
 
-#: src/compose.c:609 src/mainwindow.c:663 src/messageview.c:225
+#: src/compose.c:609 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (TIS-620)"
 
-#: src/compose.c:611 src/mainwindow.c:665 src/messageview.c:227
+#: src/compose.c:611 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字集(_C)/泰文 (Windows-874)"
 
-#: src/compose.c:615 src/mainwindow.c:722 src/messageview.c:257
+#: src/compose.c:615 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/位址簿(_A)"
 
@@ -897,13 +897,13 @@ msgstr "/工具(_T)/位址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用信件樣板(_T)"
 
-#: src/compose.c:617 src/mainwindow.c:745 src/messageview.c:272
+#: src/compose.c:617 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_n)"
 
-#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:725
-#: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
-#: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:260
+#: src/compose.c:618 src/compose.c:622 src/mainwindow.c:729
+#: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
+#: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
@@ -984,7 +984,7 @@ msgstr "新郵件%s"
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2216
+#: src/compose.c:2415 src/compose.c:4358 src/mainwindow.c:2224
 #: src/prefs_account.c:715 src/prefs_common.c:937
 msgid "Send"
 msgstr "送出"
@@ -1087,7 +1087,7 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:3997 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4204
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "大小"
 
@@ -1418,12 +1418,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1901
-#: src/folderview.c:1907
+#: src/editgroup.c:520 src/foldersel.c:500 src/folderview.c:1905
+#: src/folderview.c:1911
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1908
+#: src/editgroup.c:521 src/foldersel.c:501 src/folderview.c:1912
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -1588,160 +1588,165 @@ msgstr "您要取代已存在的檔案嗎？"
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
 
-#: src/foldersel.c:220
+#: src/foldersel.c:224
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:341 src/folderview.c:1061 src/prefs_folder_item.c:212
+#: src/foldersel.c:345 src/folderview.c:1066 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:345 src/folderview.c:1067 src/prefs_folder_item.c:213
+#: src/foldersel.c:349 src/folderview.c:1072 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:349 src/folderview.c:1073 src/prefs_folder_item.c:215
+#: src/foldersel.c:353 src/folderview.c:1078 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:353 src/folderview.c:1079 src/prefs_folder_item.c:216
+#: src/foldersel.c:357 src/folderview.c:1084 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:357 src/folderview.c:1086 src/prefs_folder_item.c:214
+#: src/foldersel.c:361 src/folderview.c:1091 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:498 src/folderview.c:1905 src/folderview.c:1909
+#: src/foldersel.c:502 src/folderview.c:1909 src/folderview.c:1913
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:506 src/folderview.c:1917 src/folderview.c:1973
+#: src/foldersel.c:510 src/folderview.c:1921 src/folderview.c:1977
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有 `%c' 這個字元。"
 
-#: src/foldersel.c:516 src/folderview.c:1927 src/folderview.c:1980
+#: src/foldersel.c:520 src/folderview.c:1931 src/folderview.c:1984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾 `%s' 已存在。"
 
-#: src/foldersel.c:524 src/folderview.c:1934
+#: src/foldersel.c:528 src/folderview.c:1938
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:226 src/folderview.c:242
+#: src/folderview.c:230 src/folderview.c:247
 msgid "/Create _new folder..."
 msgstr "/產生新的資料夾 (_n)"
 
-#: src/folderview.c:227 src/folderview.c:243
+#: src/folderview.c:231 src/folderview.c:248
 msgid "/_Rename folder..."
 msgstr "/重新命名資料夾(_R)..."
 
-#: src/folderview.c:228 src/folderview.c:244
+#: src/folderview.c:232
+#, fuzzy
+msgid "/_Move folder..."
+msgstr "/重新命名資料夾(_R)..."
+
+#: src/folderview.c:233 src/folderview.c:249
 msgid "/_Delete folder"
 msgstr "/刪除資料夾(_D)"
 
-#: src/folderview.c:230 src/folderview.c:246
+#: src/folderview.c:235 src/folderview.c:251
 msgid "/Empty _trash"
 msgstr "/清空刪除的郵件(_t)"
 
-#: src/folderview.c:232 src/folderview.c:250 src/folderview.c:266
+#: src/folderview.c:237 src/folderview.c:255 src/folderview.c:271
 msgid "/_Check for new messages"
 msgstr "/檢查新郵件(_C)"
 
-#: src/folderview.c:234 src/folderview.c:252
+#: src/folderview.c:239 src/folderview.c:257
 msgid "/R_ebuild folder tree"
 msgstr "/重建資料夾結構(_e)"
 
-#: src/folderview.c:236 src/folderview.c:254 src/folderview.c:269
+#: src/folderview.c:241 src/folderview.c:259 src/folderview.c:274
 msgid "/_Search messages..."
 msgstr "/尋找信件 (_S)"
 
-#: src/folderview.c:248 src/folderview.c:264
+#: src/folderview.c:253 src/folderview.c:269
 msgid "/Down_load"
 msgstr "/下載 (_l)"
 
-#: src/folderview.c:260
+#: src/folderview.c:265
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/預訂新聞群組 (_b)"
 
-#: src/folderview.c:262
+#: src/folderview.c:267
 msgid "/_Remove newsgroup"
 msgstr "/移除新聞群組(_R)"
 
-#: src/folderview.c:291
+#: src/folderview.c:296
 msgid "Creating folder view...\n"
 msgstr "產生資料夾...\n"
 
-#: src/folderview.c:370
+#: src/folderview.c:375
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:384 src/prefs_summary_column.c:69
+#: src/folderview.c:389 src/prefs_summary_column.c:69
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:398
+#: src/folderview.c:403
 msgid "#"
 msgstr ""
 
-#: src/folderview.c:512
+#: src/folderview.c:517
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:513
+#: src/folderview.c:518
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:797 src/mainwindow.c:3288 src/setup.c:81
+#: src/folderview.c:802 src/mainwindow.c:3301 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:801 src/mainwindow.c:3293 src/setup.c:86
+#: src/folderview.c:806 src/mainwindow.c:3306 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:843
+#: src/folderview.c:848
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:844
+#: src/folderview.c:849
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:853
+#: src/folderview.c:858
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:860
+#: src/folderview.c:865
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:930
+#: src/folderview.c:935
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1666
+#: src/folderview.c:1670
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1817
+#: src/folderview.c:1821
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載信件中..."
 
-#: src/folderview.c:1852
+#: src/folderview.c:1856
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載信件時出現錯誤。"
 
-#: src/folderview.c:1902
+#: src/folderview.c:1906
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1751,16 +1756,21 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上 `/'）"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1968
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入 `%s' 的新名稱："
 
-#: src/folderview.c:1965
+#: src/folderview.c:1969
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2048
+#: src/folderview.c:2055
+#, fuzzy, c-format
+msgid "Can't move the folder `%s'."
+msgstr "無法刪除資料夾 `%s'。"
+
+#: src/folderview.c:2109
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under `%s' will be permanently deleted.\n"
@@ -1771,24 +1781,24 @@ msgstr ""
 "所有在 `%s' 資料夾下面的信件與子資料夾都將會被刪除。\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2051
+#: src/folderview.c:2112
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2075
+#: src/folderview.c:2136
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2109
+#: src/folderview.c:2170
 msgid "Empty all messages in trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2206
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1797,34 +1807,34 @@ msgstr ""
 "確定要刪除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2147
+#: src/folderview.c:2208
 msgid "Remove mailbox"
 msgstr "/刪除信箱"
 
-#: src/folderview.c:2192
+#: src/folderview.c:2253
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2193
+#: src/folderview.c:2254
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2334
+#: src/folderview.c:2395
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組 `%s' 嗎？"
 
-#: src/folderview.c:2335
+#: src/folderview.c:2396
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2441
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號 `%s' 嗎？"
 
-#: src/folderview.c:2381
+#: src/folderview.c:2442
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -1909,156 +1919,156 @@ msgstr "產生圖像的視窗...\n"
 msgid "Can't load the image."
 msgstr "無法載入圖像。"
 
-#: src/imap.c:457
+#: src/imap.c:458
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
 
-#: src/imap.c:508 src/imap.c:514
+#: src/imap.c:509 src/imap.c:515
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 伺服器目錄"
 
-#: src/imap.c:589
+#: src/imap.c:590
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
 
-#: src/imap.c:630
+#: src/imap.c:631
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: src/imap.c:1417
+#: src/imap.c:1418
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: src/imap.c:1425 src/imap.c:1517
+#: src/imap.c:1426 src/imap.c:1518
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: src/imap.c:1511
+#: src/imap.c:1512
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: src/imap.c:1556
+#: src/imap.c:1557
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: src/imap.c:1634
+#: src/imap.c:1635
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: src/imap.c:1818 src/imap.c:1826
+#: src/imap.c:1819 src/imap.c:1827
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: src/imap.c:1940
+#: src/imap.c:1941
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: src/imap.c:1945
+#: src/imap.c:1946
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: src/imap.c:2006
+#: src/imap.c:2007
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: src/imap.c:2026
+#: src/imap.c:2027
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: src/imap.c:2095
+#: src/imap.c:2096
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: src/imap.c:2157
+#: src/imap.c:2158
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: src/imap.c:2196
+#: src/imap.c:2197
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: src/imap.c:2204
+#: src/imap.c:2205
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: src/imap.c:2225
+#: src/imap.c:2226
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: src/imap.c:2348
+#: src/imap.c:2349
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: src/imap.c:2355
+#: src/imap.c:2356
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: src/imap.c:2430
+#: src/imap.c:2431
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: src/imap.c:2957
+#: src/imap.c:2958
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: src/imap.c:3132
+#: src/imap.c:3133
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: src/imap.c:3149
+#: src/imap.c:3150
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: src/imap.c:3473
+#: src/imap.c:3474
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將信件從 %s 搬移到 %s。\n"
 
-#: src/imap.c:3480
+#: src/imap.c:3481
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: src/imap.c:3508
+#: src/imap.c:3509
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: src/imap.c:3540
+#: src/imap.c:3541
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將信件 %s 移到 %s\n"
 
-#: src/imap.c:3564
+#: src/imap.c:3565
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: src/imap.c:3578
+#: src/imap.c:3579
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: src/imap.c:3591
+#: src/imap.c:3592
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3820
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: src/imap.c:3849
+#: src/imap.c:3850
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -2160,7 +2170,7 @@ msgstr "將 LDIF 檔匯入位址簿"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2315
+#: src/importldif.c:768 src/mainwindow.c:2323
 msgid "Next"
 msgstr "下一封"
 
@@ -2378,7 +2388,7 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:133 src/mh.c:817
+#: src/main.c:133 src/mh.c:821
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2498,623 +2508,628 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:471
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:472
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_n)"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:474
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:475
+#, fuzzy
+msgid "/_File/_Folder/_Move folder..."
+msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
+
+#: src/mainwindow.c:476
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_m)..."
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:479
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/刪除信箱 (_R)"
 
-#: src/mainwindow.c:476 src/mainwindow.c:481
+#: src/mainwindow.c:480 src/mainwindow.c:485
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:483
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_a)"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_e)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:489
 msgid "/_File/_Import mbox file..."
 msgstr "/檔案(_F)/匯入郵件(_I)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/_Export to mbox file..."
 msgstr "/檔案(_F)/匯出資料夾(_E)"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:492
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_t)"
 
-#: src/mainwindow.c:490 src/messageview.c:138
+#: src/mainwindow.c:494 src/messageview.c:138
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:491 src/messageview.c:139
+#: src/mainwindow.c:495 src/messageview.c:139
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印...(_P)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:497
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_t)"
 
-#: src/mainwindow.c:503 src/messageview.c:147
+#: src/mainwindow.c:507 src/messageview.c:147
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前信件中尋找(_F)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找信件(_S)"
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:512
 msgid "/_View/Show or hi_de"
 msgstr "/顯示(_V)/顯示或隱藏(_d)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/資料夾列表(_F)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/信件預覽(_M)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣與文字(_a)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:525
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_d)/狀態列(_b)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_o)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將信件預覽分離(_e)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_n)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_i)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_d)"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_f)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_i)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用標題排序(_s)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_c)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_m)"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_u)"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_t)"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_o)"
 
-#: src/mainwindow.c:543 src/mainwindow.c:546
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:544
+#: src/mainwindow.c:548
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用信件串列排序(_A)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將信件串列顯示(_r)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有信件串列(_x)"
 
-#: src/mainwindow.c:551
+#: src/mainwindow.c:555
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有信件串列(_l)"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:556
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目...(_i)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:560
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往...(_G)/前一封信件(_P)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往...(_G)/下一封信件(_N)"
 
-#: src/mainwindow.c:558 src/mainwindow.c:563 src/mainwindow.c:566
-#: src/mainwindow.c:571 src/mainwindow.c:576
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往...(_G)/---"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往...(_G)/前一封未讀信件(_r)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:565
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往...(_G)/下一封未讀信件(_e)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:568
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往...(_G)/前一封新信件(_w)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往...(_G)/下一封新信件(_x)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記信件(_m)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:573
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記信件(_a)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往...(_G)/前一封已標記顏色之信件(_l)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:578
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往...(_G)/下一封已標記顏色之信件(_b)"
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:581
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往...(_G)/到其他資料夾(_f)"
 
-#: src/mainwindow.c:586 src/messageview.c:158
+#: src/mainwindow.c:590 src/messageview.c:158
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字集(_C)/自動偵測(_A)"
 
-#: src/mainwindow.c:637 src/messageview.c:202
+#: src/mainwindow.c:641 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字集(_C)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:639 src/messageview.c:204
+#: src/mainwindow.c:643 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:641 src/messageview.c:206
+#: src/mainwindow.c:645 src/messageview.c:206
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字集(_C)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:653 src/messageview.c:217
+#: src/mainwindow.c:657 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字集(_C)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:659 src/messageview.c:222
+#: src/mainwindow.c:663 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字集(_C)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:672 src/summaryview.c:401
+#: src/mainwindow.c:676 src/summaryview.c:401
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_w)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:677 src/messageview.c:234
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看信件原始碼(_a)"
 
-#: src/mainwindow.c:674 src/messageview.c:235
+#: src/mainwindow.c:678 src/messageview.c:235
 msgid "/_View/Show all _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_h)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:680
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新信件列表(_U)"
 
-#: src/mainwindow.c:678 src/messageview.c:237
+#: src/mainwindow.c:682 src/messageview.c:237
 msgid "/_Message"
 msgstr "/信件(_M)"
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:683
 msgid "/_Message/Recei_ve"
 msgstr "/信件(_M)/接收(_v)"
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:684
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/信件(_M)/接收(_v)/從目前帳號中接收新郵件(_c)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:686
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/信件(_M)/接收(_v)/從所有帳號中接收新郵件(_a)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:688
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/信件(_M)/接收(_v)/取消接收(_g)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:690
 msgid "/_Message/Recei_ve/---"
 msgstr "/信件(_M)/接收(_v)/---"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:691
 msgid "/_Message/_Send queued messages"
 msgstr "/信件(_M)/將暫存資料夾中的信件送出(_S)"
 
-#: src/mainwindow.c:688 src/mainwindow.c:690 src/mainwindow.c:697
-#: src/mainwindow.c:702 src/mainwindow.c:706 src/mainwindow.c:715
-#: src/mainwindow.c:718 src/messageview.c:240 src/messageview.c:248
+#: src/mainwindow.c:692 src/mainwindow.c:694 src/mainwindow.c:701
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/mainwindow.c:719
+#: src/mainwindow.c:722 src/messageview.c:240 src/messageview.c:248
 #: src/messageview.c:253
 msgid "/_Message/---"
 msgstr "/信件(_M)/---"
 
-#: src/mainwindow.c:689 src/messageview.c:238
+#: src/mainwindow.c:693 src/messageview.c:238
 msgid "/_Message/Compose _new message"
 msgstr "/信件(_M)/撰寫郵件(_n)"
 
-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/_Reply"
 msgstr "/信件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:696
 msgid "/_Message/Repl_y to"
 msgstr "/信件(_M)/回覆給(_y)"
 
-#: src/mainwindow.c:693 src/messageview.c:242
+#: src/mainwindow.c:697 src/messageview.c:242
 msgid "/_Message/Repl_y to/_all"
 msgstr "/信件(_M)/回覆給(_y)/所有收件人(_a)"
 
-#: src/mainwindow.c:694 src/messageview.c:244
+#: src/mainwindow.c:698 src/messageview.c:244
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/信件(_M)/回覆給(_y)/原作者(_s)"
 
-#: src/mainwindow.c:695 src/messageview.c:246
+#: src/mainwindow.c:699 src/messageview.c:246
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/信件(_M)/回覆給(_y)/Mailing List(_l)"
 
-#: src/mainwindow.c:698 src/messageview.c:249
+#: src/mainwindow.c:702 src/messageview.c:249
 msgid "/_Message/_Forward"
 msgstr "/信件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:699 src/messageview.c:250
+#: src/mainwindow.c:703 src/messageview.c:250
 msgid "/_Message/For_ward as attachment"
 msgstr "/信件(_M)/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:701 src/messageview.c:252
+#: src/mainwindow.c:705 src/messageview.c:252
 msgid "/_Message/Redirec_t"
 msgstr "/信件(_M)/信件導向(_t)"
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:707
 msgid "/_Message/M_ove..."
 msgstr "/信件(_M)/移動...(_o)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:708
 msgid "/_Message/_Copy..."
 msgstr "/信件(_M)/複製...(_C)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:709
 msgid "/_Message/_Delete"
 msgstr "/信件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:711
 msgid "/_Message/_Mark"
 msgstr "/信件(_M)/標記(_M)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:712
 msgid "/_Message/_Mark/_Mark"
 msgstr "/信件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:713
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/信件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:714
 msgid "/_Message/_Mark/---"
 msgstr "/信件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:715
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/信件(_M)/標記(_M)/標記成未讀(_e)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:716
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/信件(_M)/標記(_M)/標記成已讀(_d)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:718
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/信件(_M)/標記(_M)/標記所有信件成已讀(_d)"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:721
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/信件(_M)/接收新郵件(_i)"
 
-#: src/mainwindow.c:719 src/messageview.c:254
+#: src/mainwindow.c:723 src/messageview.c:254
 msgid "/_Message/Re-_edit"
 msgstr "/信件(_M)/重新編輯(_e)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:727
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入位址簿(_k)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:730
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:732
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:730 src/messageview.c:261
+#: src/mainwindow.c:734 src/messageview.c:261
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生信件過濾規則(_C)"
 
-#: src/mainwindow.c:731 src/messageview.c:263
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:733 src/messageview.c:265
+#: src/mainwindow.c:737 src/messageview.c:265
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:735 src/messageview.c:267
+#: src/mainwindow.c:739 src/messageview.c:267
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:737 src/messageview.c:269
+#: src/mainwindow.c:741 src/messageview.c:269
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生信件過濾規則(_C)/依標題(_S)"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:744
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有信件(_F)"
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:746
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的信件(_F)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:751
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的信件(_p)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:754
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/執行(_x)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:756
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:754
+#: src/mainwindow.c:758
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:759
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定...(_C)"
 
-#: src/mainwindow.c:757
+#: src/mainwindow.c:761
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/信件過濾設定...(_F)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:763
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/信件樣板設定...(_T)"
 
-#: src/mainwindow.c:760
+#: src/mainwindow.c:764
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定...(_A)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:765
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:762
+#: src/mainwindow.c:766
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:768
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號...(_n)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:770
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號...(_E)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:772
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_h)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:776
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:777
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:778
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:779
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:780
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:781
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_F)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:782
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:783
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:784
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_E)"
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:785
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:825
 msgid "Creating main window...\n"
 msgstr "產生主視窗...\n"
 
-#: src/mainwindow.c:983
+#: src/mainwindow.c:987
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1067 src/summaryview.c:2020 src/summaryview.c:2105
-#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3715
+#: src/mainwindow.c:1071 src/summaryview.c:2020 src/summaryview.c:2105
+#: src/summaryview.c:3342 src/summaryview.c:3415 src/summaryview.c:3720
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1192 src/mainwindow.c:1233 src/mainwindow.c:1261
+#: src/mainwindow.c:1196 src/mainwindow.c:1237 src/mainwindow.c:1265
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1262
+#: src/mainwindow.c:1266
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1312
+#: src/mainwindow.c:1316
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1532
+#: src/mainwindow.c:1536
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1533
+#: src/mainwindow.c:1537
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1547
+#: src/mainwindow.c:1551
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1548
+#: src/mainwindow.c:1552
 msgid "Empty messages in all trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1576
+#: src/mainwindow.c:1580
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1577
+#: src/mainwindow.c:1581
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3124,16 +3139,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱。\n"
 "系統將會自動判別是否信箱已存在。"
 
-#: src/mainwindow.c:1583
+#: src/mainwindow.c:1587
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱 %s 已存在。"
 
-#: src/mainwindow.c:1588 src/setup.c:57
+#: src/mainwindow.c:1592 src/setup.c:57
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1594 src/setup.c:63
+#: src/mainwindow.c:1598 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3142,150 +3157,150 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:1981
+#: src/mainwindow.c:1989
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾列表"
 
-#: src/mainwindow.c:2001 src/messageview.c:368
+#: src/mainwindow.c:2009 src/messageview.c:368
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 信件列表"
 
-#: src/mainwindow.c:2148 src/summaryview.c:370
+#: src/mainwindow.c:2156 src/summaryview.c:370
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2149
+#: src/mainwindow.c:2157
 msgid "/Reply to _all"
 msgstr "/全部回覆(_a)"
 
-#: src/mainwindow.c:2150
+#: src/mainwindow.c:2158
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_s)"
 
-#: src/mainwindow.c:2151
+#: src/mainwindow.c:2159
 msgid "/Reply to mailing _list"
 msgstr "/回覆到 Mailing list(_l)"
 
-#: src/mainwindow.c:2156 src/summaryview.c:377
+#: src/mainwindow.c:2164 src/summaryview.c:377
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2157 src/summaryview.c:378
+#: src/mainwindow.c:2165 src/summaryview.c:378
 msgid "/For_ward as attachment"
 msgstr "/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:2158 src/summaryview.c:379
+#: src/mainwindow.c:2166 src/summaryview.c:379
 msgid "/Redirec_t"
 msgstr "/信件導向(_t)"
 
-#: src/mainwindow.c:2197
+#: src/mainwindow.c:2205
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2198
+#: src/mainwindow.c:2206
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2205
+#: src/mainwindow.c:2213
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2214
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2225
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的信件送出"
 
-#: src/mainwindow.c:2227 src/prefs_account.c:717 src/prefs_common.c:939
+#: src/mainwindow.c:2235 src/prefs_account.c:717 src/prefs_common.c:939
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2236
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2236 src/prefs_common.c:1438
+#: src/mainwindow.c:2244 src/prefs_common.c:1438
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2237 src/mainwindow.c:2250
+#: src/mainwindow.c:2245 src/mainwindow.c:2258
 msgid "Reply to the message"
 msgstr "回覆信件"
 
-#: src/mainwindow.c:2255
+#: src/mainwindow.c:2263
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2256
+#: src/mainwindow.c:2264
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2264 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2272 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2265 src/mainwindow.c:2278
+#: src/mainwindow.c:2273 src/mainwindow.c:2286
 msgid "Forward the message"
 msgstr "轉寄信件"
 
-#: src/mainwindow.c:2286
+#: src/mainwindow.c:2294
 msgid "Delete the message"
 msgstr "刪除信件"
 
-#: src/mainwindow.c:2295 src/prefs_common.c:1978
+#: src/mainwindow.c:2303 src/prefs_common.c:1978
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2296
+#: src/mainwindow.c:2304
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "設為預設帳號"
 
-#: src/mainwindow.c:2305
+#: src/mainwindow.c:2313
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2306
+#: src/mainwindow.c:2314
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2324
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2327
+#: src/mainwindow.c:2335
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2328
+#: src/mainwindow.c:2336
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2335 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2343 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2336
+#: src/mainwindow.c:2344
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2519
+#: src/mainwindow.c:2527
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2530
+#: src/mainwindow.c:2538
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2718
+#: src/mainwindow.c:2731
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3446,30 +3461,30 @@ msgstr ""
 "輸入的列印指令有誤：\n"
 "`%s'"
 
-#: src/mh.c:405
+#: src/mh.c:409
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "無法將信件從 %s 搬移到 %s。\n"
 
-#: src/mh.c:477 src/mh.c:598
+#: src/mh.c:481 src/mh.c:602
 msgid "Can't open mark file.\n"
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/mh.c:484 src/mh.c:604
+#: src/mh.c:488 src/mh.c:608
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: src/mh.c:607
+#: src/mh.c:611
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr ""
 
-#: src/mh.c:774
+#: src/mh.c:778
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr ""
 
-#: src/mh.c:1218
+#: src/mh.c:1300
 #, c-format
 msgid ""
 "Directory name\n"
@@ -3567,81 +3582,81 @@ msgstr ""
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "開啟此 MIME 型態的命令是錯誤的：`%s'"
 
-#: src/news.c:208
+#: src/news.c:209
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "產生新聞通訊協定連線到 %s:%d , 請稍候...\n"
 
-#: src/news.c:278
+#: src/news.c:279
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "到 %s:%d 的新聞通訊協定連線被中斷了。重新連線中...\n"
 
-#: src/news.c:369
+#: src/news.c:370
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr ""
 
-#: src/news.c:389
+#: src/news.c:390
 #, c-format
 msgid "getting article %d...\n"
 msgstr ""
 
-#: src/news.c:393
+#: src/news.c:394
 #, c-format
 msgid "can't read article %d\n"
 msgstr "無法讀取文章 %d\n"
 
-#: src/news.c:547
+#: src/news.c:548
 msgid "can't retrieve newsgroup list\n"
 msgstr "無法取得新聞群組列表\n"
 
-#: src/news.c:660
+#: src/news.c:661
 msgid "can't post article.\n"
 msgstr "無法發表文章\n"
 
-#: src/news.c:686
+#: src/news.c:687
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "無法取得文章 %d\n"
 
-#: src/news.c:743
+#: src/news.c:744
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "無法選擇新聞群組：%s\n"
 
-#: src/news.c:780
+#: src/news.c:781
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "錯誤的文章範圍：%d - %d\n"
 
-#: src/news.c:793
+#: src/news.c:794
 msgid "no new articles.\n"
 msgstr "沒有新文章。\n"
 
-#: src/news.c:803
+#: src/news.c:804
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:807
+#: src/news.c:808
 msgid "can't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:817
+#: src/news.c:818
 msgid "error occurred while getting xover.\n"
 msgstr "取得 xover 時發生錯誤。\n"
 
-#: src/news.c:827
+#: src/news.c:828
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "xover 內容錯誤：%s\n"
 
-#: src/news.c:846 src/news.c:878
+#: src/news.c:847 src/news.c:879
 msgid "can't get xhdr\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:858 src/news.c:890
+#: src/news.c:859 src/news.c:891
 msgid "error occurred while getting xhdr.\n"
 msgstr "取得 xover 時發生錯誤。\n"
 
@@ -5356,17 +5371,17 @@ msgid "Attachment"
 msgstr "附加"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4197
+#: src/prefs_summary_column.c:71 src/summaryview.c:4202
 msgid "Subject"
 msgstr "主題"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4200
+#: src/prefs_summary_column.c:72 src/summaryview.c:4205
 msgid "From"
 msgstr "來源(From)"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4202
+#: src/prefs_summary_column.c:73 src/summaryview.c:4207
 msgid "Date"
 msgstr "日期"
 
@@ -6122,20 +6137,20 @@ msgstr "產生信件串列中..."
 msgid "Unthreading..."
 msgstr "解除信件串列中..."
 
-#: src/summaryview.c:3691
+#: src/summaryview.c:3696
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:3692
+#: src/summaryview.c:3697
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:3722
+#: src/summaryview.c:3727
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封信件"
 
-#: src/summaryview.c:4206
+#: src/summaryview.c:4211
 msgid "No."
 msgstr ""
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-07-01 10:42:15 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2005-07-01 10:42:15 +0000
commit	0ada6c15f7eef4e46d8f1b8964dad1193692a10a (patch)
tree	e767d7b49be640a123d3bf49ae751fa2af7ba441 /po
parent	0839e124a6910f5d134ec3b229466cd470b0c7ea (diff)