perform show/hide on trayicon click. Implemented popup menu on trayicon.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@896 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-01-13 09:20:58 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-01-13 09:20:58 +0000
commit: f4ef5b2fe53d60d2d9bd4ed4f3c0b3f9c7be53bb (patch)
tree: 5a62bfb178c4455df4f262655e6031d70b35a788 /po
parent: 80072d1ee0161c430f44b40ad52d3038a039d364 (diff)
30 files changed, 11421 insertions, 10411 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 81c44dba..f3703e3a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,4 +92,5 @@ src/summaryview.c
 src/syldap.c
 src/template.c
 src/textview.c
+src/trayicon.c
 src/vcard.c
diff --git a/po/bg.po b/po/bg.po
index 49268e10..78f60470 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -505,7 +505,7 @@ msgstr "Намерени %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Папка"
@@ -966,8 +966,8 @@ msgstr "/Нова _Папка"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -986,7 +986,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -997,7 +997,7 @@ msgstr "Име:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1046,7 +1046,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1159,7 +1159,7 @@ msgstr "Грешка при конвертиране на адресната к�
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Папка"
@@ -1256,7 +1256,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Никой"
 
@@ -1269,7 +1269,7 @@ msgid "/_Remove"
 msgstr "/_Премахване"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
@@ -1731,12 +1731,12 @@ msgstr "MIME тип"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Изпращане"
 
@@ -1778,7 +1778,7 @@ msgstr "Прикрепване на файл"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Сигнатура"
 
@@ -1787,8 +1787,8 @@ msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1816,7 +1816,7 @@ msgstr "Файлът не съществува или е празен"
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Кодиране"
 
@@ -2046,12 +2046,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2069,7 +2069,7 @@ msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2219,42 +2219,42 @@ msgstr "Директория на спула"
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2263,7 +2263,7 @@ msgstr "Папката `%s' не може да бъде създадена."
 msgid "/Create _new folder..."
 msgstr "/Създаване на _нова папка..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Преименуване на папка..."
 
@@ -2272,7 +2272,7 @@ msgstr "/_Преименуване на папка..."
 msgid "/_Move folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Изтриване на папка"
 
@@ -2281,7 +2281,7 @@ msgstr "/_Изтриване на папка"
 msgid "/Empty _trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
@@ -2289,20 +2289,20 @@ msgstr "/_Проверка за нови съобщения"
 msgid "/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Търсене на съобщения..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Няма непрочетени съобщения."
@@ -2315,81 +2315,81 @@ msgstr "/_Записване в новинарска група"
 msgid "/_Remove newsgroup"
 msgstr "/_Премахване на новинарска група"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2399,21 +2399,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Папка `%s' не може да се премахне."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2422,12 +2427,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2438,21 +2443,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2461,34 +2466,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2613,7 +2618,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Следващ"
 
@@ -2634,7 +2639,7 @@ msgstr "Завършване"
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Стар Sylpheed"
@@ -3579,52 +3584,52 @@ msgstr "/_Помощ/---"
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3635,16 +3640,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3653,149 +3658,149 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3852,25 +3857,25 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4037,11 +4042,11 @@ msgstr "Предпочитания за акаунт"
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
@@ -4049,7 +4054,7 @@ msgstr "Неприкосновеност"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Напреднал"
 
@@ -4176,7 +4181,7 @@ msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4221,8 +4226,8 @@ msgstr "Генериране на Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Редактиране... "
 
@@ -4554,88 +4559,88 @@ msgstr "Изтриване на действие"
 msgid "Do you really want to delete this action?"
 msgstr "Желаете ли изтриване на действието?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Създаване на прозорец за общи предпочитания...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Общи Предпочитания"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Дисплей"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Автоматично проверяване за нова поща"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "всеки"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "минута(и)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Проверка за нова поща при стартиране"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Обновяване на всички локални папки след приемане"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Приемане от спул"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Филтриране при приемане"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Запазване на изпратените съобщения в Изпратени"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Преносно кодиране"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4644,169 +4649,169 @@ msgstr ""
 "Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
 "използвано когато тялото на съобщението съдържа не-ASCII знаци."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Главни"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Разделител на сигнатурата"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Автоматично вмъкване"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Автоматично избиране на акаунт за отговор"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Цитиране на съобщението при отговаряне"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Автоматично стартиране на външен редактор"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Ниво на отмяна"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Пренасяне на съобщенията на"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "знака"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Пренасяне на цитат"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Пренасяне при въвеждане"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Пренасяне преди изпращане"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Запазване в папката с чернови"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Нормална"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Формат на отговора"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Маркиране на цитат"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Формат на препращане"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Описание на символите "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Входяща кутия"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Текст"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Съкращаване на новинарски групи по дълги от"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "букви"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Изглед на извадката"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Формат на датата"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "Определяне на атрибути на извадката"
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Съобщение"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4815,11 +4820,11 @@ msgstr ""
 "Ако е избрано `Автоматично', ще бъде избрано\n"
 "оптималното за текущия локал кодиране."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Позволяване на оцветяване на съобщение"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4827,542 +4832,547 @@ msgstr ""
 "Показване на multi-byte азбука и цифри като\n"
 "ASCII знаци (само за Японски)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Панел със заглавна част над изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Разстояние м/у редовете"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "пиксел(а)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Превъртане"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Половин страница"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Плавно превъртане"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Стъпка"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Разпъване на прикрепени изображения"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка на показваните заглавки части"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Изберете ключове"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Изтриване на папка"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Автоматична проверка на подписите"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Временно съхраняване на паролата в паметта"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Невалидно след"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "минута(и)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Установяване на `0' ще съхранява паролата\n"
 "през цялата сесия)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Прехващане на входа при въвеждане на парола"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Отваряне винаги на съобщенията избрани в извадката"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Влизане във входящата кутия след получаване на нови съобщения"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Съобщенията ще бъдат маркирани до изпълнението\n"
 "ако това е изключено)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Екранно Име"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Други"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Диалог при получаване"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Показване на диалог при получаване"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Винаги"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Никога"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Без повдигане на диалог за грешка при грешка при получаване"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Затваряне на диалога при получаване когато завърши"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Добавяне на адреса в назначението при двойно щракване"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "При излизане"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Потвърждение при излизане"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Изчистване на Кошчето на излизане"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Питане преди изчистване"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Предупреждение ако има съобщения в опашката"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Входяща кутия"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Използване на външна програма за приемане"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Просрочка на В/И порт:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "секунда(и)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Автоматично (Препоръчително)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Западно европейски (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европейски (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийски (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5386,11 +5396,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5404,7 +5414,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5416,20 +5426,20 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
@@ -5784,19 +5794,19 @@ msgstr "Притурка"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Дата"
 
@@ -6468,98 +6478,98 @@ msgstr "\tСъставяне на извадката от данните на с
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "No."
 
@@ -6581,7 +6591,7 @@ msgstr "Съобщението не може да бъде показано.\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
@@ -6618,6 +6628,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Съобщение/Получаване от _всички акаунти"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Съобщение/Получаване от _всички акаунти"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Изпращане на съобщенията в опашката"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Относно"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Изход"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Аксесоари на папка"
diff --git a/po/cs.po b/po/cs.po
index 8a685b6f..b8809bc3 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -508,7 +508,7 @@ msgstr "Nalezený %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurace je uložena.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Složka"
@@ -969,8 +969,8 @@ msgstr "/Nová s_ložka"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -989,7 +989,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -1000,7 +1000,7 @@ msgstr "Jméno:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -1160,7 +1160,7 @@ msgstr "Chyba při konverzi databáze adres"
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Rozhraní"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Složka"
@@ -1257,7 +1257,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Žádná"
 
@@ -1270,7 +1270,7 @@ msgid "/_Remove"
 msgstr "/_Odstranit"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -1732,12 +1732,12 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Odeslat"
 
@@ -1779,7 +1779,7 @@ msgstr "Připojí soubor"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1788,8 +1788,8 @@ msgid "Insert signature"
 msgstr "Vloží podpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1817,7 +1817,7 @@ msgstr "Soubor neexistuje nebo je prázdný."
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kódování"
 
@@ -2048,12 +2048,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2071,7 +2071,7 @@ msgstr "Upravit JPilot soubor"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2221,42 +2221,42 @@ msgstr "Spool adresář"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
@@ -2265,7 +2265,7 @@ msgstr "Nemohu vytvořit složku '%s'."
 msgid "/Create _new folder..."
 msgstr "/_Vytvořit novou složku..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
@@ -2274,7 +2274,7 @@ msgstr "/Přej_menovat složku..."
 msgid "/_Move folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
@@ -2283,7 +2283,7 @@ msgstr "/_Smazat složku"
 msgid "/Empty _trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
@@ -2291,20 +2291,20 @@ msgstr "/_Zkontrolovat nové zprávy"
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Na_jít zprávy..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žádné nepřečtené zprávy."
@@ -2317,82 +2317,82 @@ msgstr "/Při_hlásit diskusní skupinu..."
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusní skupinu"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Vytvářím náhled pro složku...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nová"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o složce...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2402,21 +2402,26 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Nemohu odstranit složku '%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2425,12 +2430,12 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2441,21 +2446,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2464,34 +2469,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -2616,7 +2621,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Další"
 
@@ -2637,7 +2642,7 @@ msgstr "Konec"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Starý Sylpheed"
@@ -3582,52 +3587,52 @@ msgstr "/Nápo_věda/---"
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3638,16 +3643,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3657,149 +3662,149 @@ 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:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3856,25 +3861,25 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4041,11 +4046,11 @@ msgstr "Nastavení účtu"
 msgid "Creating account preferences window...\n"
 msgstr "Vyvolání okna pro nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Soukromí"
 
@@ -4053,7 +4058,7 @@ msgstr "Soukromí"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Rozšíření"
 
@@ -4180,7 +4185,7 @@ msgid "Authentication method"
 msgstr "Metoda autentizace"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -4224,8 +4229,8 @@ msgstr "Generovat číslo zprávy"
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Upravit..."
 
@@ -4556,88 +4561,88 @@ msgstr "Smazat akci"
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete smazat tuto akci?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Vytvářím okno hlavního nastavení...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Společná nastavení"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Složka"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatická kontrola nové pošty"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minut(y)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Kontrola nové pošty při spuštění"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Po začlenění aktualizovat všechny lokální složky"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Začlenit ze spoolu"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtr na začlenění"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4646,169 +4651,169 @@ msgstr ""
 "Určuje jak v jaké znakové sadě bude zpráva\n"
 "poslána když obsahuje ne-ASCII znaky."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Obecné"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Automaticky vložit"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automaticky vybrat účet pro odpovědi"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citovat zprávy při odpovídání"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit externí editor"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Zarovnat zprávu na"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Zalomit citaci"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Zalomit při přijmutí"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Zalomit před odesláním"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Uloží koncept do složky"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normální"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formát odpovědi"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Značka pro citaci"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formát přeposlání"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Popis symbolů "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Výchozí podpisový klíč"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Složka"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Zobrazit počet nepřečtených za názvem složky"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Zobrazit počet nepřečtených za názvem složky"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "dopisy(ů)"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Souhrnný pohled"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Rozbalit vlákna"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formát datumu"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Nastavení zobrazených položek v souhrnu... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4817,11 +4822,11 @@ msgstr ""
 "Pokud je zvoleno 'Automatická', bude použita\n"
 "znaková sada podle locale."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Povolit zabarvení zpráv"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4829,542 +4834,547 @@ msgstr ""
 "Zobrazit více-bytovou abecedu a číslice\n"
 "jako ASCII znaky (pouze pro Japonsko)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Zobrazit okno se záhlavím nad zprávou"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(y)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Změnit velikost připojených obrázků"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazit nastavení záhlaví"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Složka"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Provést"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vybrat klíče"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Provést"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Složka"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtr zpráv pro příjem"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Odebrat diskusní server"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automaticky zkontrolovat podpis"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazit výsledek testování podpisu v popup okně"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložit passphrase dočasně v paměti"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Vyprší za"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minut(y) "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavení na '0' uloží passphrase\n"
 " pro celou relaci)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazit varování pokud GnuPG nefunguje"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Vybrané zprávy vždy otvírat v přehledu"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Pokud je tato volba vypnuta,\n"
 "zprávy budou označeny až do vykonání)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Zobrazit jméno"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostatní"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Provést"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Dialog o přijetí"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Zobrazit dialog o přijetí"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Při příjmu chyby nezobrazovat popup dialog"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Zavřít dialog o přijetí po dokončení"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Přidat adresu do cíle dvojklikem"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potvrdit ukončení"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Při ukončení vyprázdnit koš"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Potvrdit vyprázdnění"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zprávy ve frontě"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Výchozí inbox"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Použít externí program k začlenění"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Použít externí program pro posílání"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Čas vypršení pro I/O:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekund(a)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatická (doporučeno)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bitový ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropská (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltická (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltická (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Řecká (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Řecká (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecká (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonská (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonská (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonská (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínská (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínská (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínská (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korejská (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thajská (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thajská (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "zkratky pro názvy dnů v týdnu"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Nastavení barev pro zprávy"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - První úroveň"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Třetí úroveň"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Zvolte barvu pro 1 úroveň citace"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Zvolte barvu pro 2 úroveň citace"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Zvolte barvu pro 3 úroveň citace"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Získat barvu z URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5388,11 +5398,11 @@ msgstr ""
 "Diskuzní skupina\n"
 "Číslo zprávy"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5406,7 +5416,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5418,20 +5428,20 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
@@ -5787,19 +5797,19 @@ msgstr "Příloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6472,99 +6482,99 @@ msgstr "\tNastavuji přehled z dat zpráv..."
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena pro přesun do %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Čís."
 
@@ -6587,7 +6597,7 @@ msgstr "zpráva nebyla přijata\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Uložit jako..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytváří novou zprávu"
@@ -6624,6 +6634,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Zpráva/Přijmout _ze všech účtů"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Zpráva/Přijmout _ze všech účtů"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Odešle pozdrženou zprávu(y)"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O aplikaci"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Ukončení programu"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Vlastnosti složky"
diff --git a/po/da.po b/po/da.po
index f7a52ec1..39614a22 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -509,7 +509,7 @@ msgstr "Fundet %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mappe"
@@ -970,8 +970,8 @@ msgstr "/Ny _mappe"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -990,7 +990,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1001,7 +1001,7 @@ msgstr "Navn:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1049,7 +1049,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1157,7 +1157,7 @@ msgstr "Adressebog konverterings fejl"
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Brugerflade"
 
@@ -1178,7 +1178,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Mappe"
@@ -1254,7 +1254,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ingen"
 
@@ -1267,7 +1267,7 @@ msgid "/_Remove"
 msgstr "/_Fjern"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -1729,12 +1729,12 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Send"
 
@@ -1776,7 +1776,7 @@ msgstr "Vedhæft fil"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Underskrift"
 
@@ -1785,8 +1785,8 @@ msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1814,7 +1814,7 @@ msgstr "Fil eksisterer ikke eller er tom."
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
@@ -2044,12 +2044,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2067,7 +2067,7 @@ msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2217,42 +2217,42 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2261,7 +2261,7 @@ msgstr "Kan ikke oprette mappe `%s'."
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Omdøb mappe..."
 
@@ -2270,7 +2270,7 @@ msgstr "/_Omdøb mappe..."
 msgid "/_Move folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
@@ -2279,7 +2279,7 @@ msgstr "/_Slet mappe"
 msgid "/Empty _trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
@@ -2287,20 +2287,20 @@ msgstr "_Hent nye meddelelser"
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Søg meddelelse..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ulæste meddelelser."
@@ -2313,82 +2313,82 @@ msgstr "/Abonner på nyhedsgruppe..."
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,21 +2398,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Kan ikke slette mappe `%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2421,12 +2426,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2437,21 +2442,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2460,34 +2465,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2612,7 +2617,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Næste"
 
@@ -2633,7 +2638,7 @@ msgstr "Slut"
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
@@ -3582,52 +3587,52 @@ msgstr "/_Hjælp/---"
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3638,16 +3643,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3656,149 +3661,149 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3855,25 +3860,25 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4040,11 +4045,11 @@ msgstr "Konto opsæt"
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privat"
 
@@ -4052,7 +4057,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avanceret"
 
@@ -4179,7 +4184,7 @@ msgid "Authentication method"
 msgstr "Godkendelses metode"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4221,8 +4226,8 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Redigér... "
 
@@ -4554,88 +4559,88 @@ msgstr "Slet handling"
 msgid "Do you really want to delete this action?"
 msgstr "Vil du virkelig slette denne handling?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Opretter generelt opsæt vindue...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Generelt opsæt"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Vis"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatisk hentning af ny post"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "hver"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Hent e-post ved programstart"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Opdater alle mapper efter modtagelse"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Modtager fra lokal spool"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filter ved modtagelse"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Gem sendte meddelelser i Sendt"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Kodning af overførsel"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4644,169 +4649,169 @@ msgstr ""
 "Angiv Content-Transfer-Encoding anvendt hvis\n"
 "besked inholder andet end ASCII tegn."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generel"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Underskriftsdeling"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Tilføj automatisk"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Vælg automatisk konto ved besvarelse"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citat af meddelelse i svar"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Svar knap starter svar til mail liste"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Start automatisk ekstern editor"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Fortryd niveauer"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Del linier ved"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "tegn"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Del citat linier"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Del ved indtastning"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Del linier før afsendelse"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Gem i Kladde"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Svar format"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Citat tegn"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Videresend format"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Beskrivelse af symboler "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Standard underskriftsnøgle"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe længere end"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "bogstaver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Vælg oplysninger i oversigt... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Meddelelse"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4815,11 +4820,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegnsæt for den valgte locale."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4827,540 +4832,545 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Blød scroll"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Ændre størrelse på vedhæftede billeder"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Hoved opsæt"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vælg nøgle"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Slet mappe"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Udløb efter"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Sæt til '0' vil gemme adgangssætningen\n"
 " for hele sessionen)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangssætning indtastes"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Vis navn"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Anden"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overførsel"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Spørg ved afslut"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Tøm Slettet ved afslut"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Spørg før tømning"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i kø"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standard indbakke"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Benyt eksternt program til modtagelse af e-post"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Skriver oversigt (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Anbefalet)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5384,11 +5394,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5402,7 +5412,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5414,20 +5424,20 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
@@ -5782,19 +5792,19 @@ msgstr "Vedhæftet"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Dato"
 
@@ -6470,101 +6480,101 @@ msgstr "\tOpretter oversigt ud fra meddelelses data..."
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr."
 
@@ -6587,7 +6597,7 @@ msgstr "en meddelelse vil ikke blive modtaget\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
@@ -6624,6 +6634,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Meddelelse/Hent fra _alle konti"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Meddelelse/Hent fra _alle konti"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Sender meddelelse(r) i kø"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Afslut"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Mappe egenskaber"
diff --git a/po/de.po b/po/de.po
index ff2a00d8..ccaec9bd 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2006-01-04 09:13+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -510,7 +510,7 @@ msgstr "Gefunden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
@@ -971,8 +971,8 @@ msgstr "/Neue Ab_lage"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -991,7 +991,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1002,7 +1002,7 @@ msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1163,7 +1163,7 @@ msgstr "Adressbuch-Konvertierungs-Fehler"
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Ablage"
@@ -1260,7 +1260,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Keine"
 
@@ -1273,7 +1273,7 @@ msgid "/_Remove"
 msgstr "/_Entfernen"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -1701,12 +1701,12 @@ msgstr "MIME-Typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Senden"
 
@@ -1748,7 +1748,7 @@ msgstr "Datei anhängen"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Unterschrift"
 
@@ -1757,8 +1757,8 @@ msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1786,7 +1786,7 @@ msgstr "Datei existiert nicht oder ist leer."
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
@@ -2010,12 +2010,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2033,7 +2033,7 @@ msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2182,42 +2182,42 @@ msgstr "Wähle Verzeichnis"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2226,7 +2226,7 @@ msgstr "Kann Ablage '%s' nicht erstellen."
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
@@ -2234,7 +2234,7 @@ msgstr "/Ablage _umbenennen..."
 msgid "/_Move folder..."
 msgstr "/Ablage _verschieben..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
@@ -2242,7 +2242,7 @@ msgstr "/Ablage _löschen"
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten prüfen"
 
@@ -2250,19 +2250,19 @@ msgstr "/Auf neue Nachrichten prüfen"
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 msgid "/_Update summary"
 msgstr "/_Update Zusammenfassung"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
@@ -2274,81 +2274,81 @@ msgstr "/Newsgroup _abonnieren..."
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2358,21 +2358,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Kann Ablage '%s' nicht entfernen."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2381,12 +2386,12 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ablage löschen"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,20 +2404,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2426,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2574,7 +2579,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Nächste"
 
@@ -2595,7 +2600,7 @@ msgstr "Ende"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3515,50 +3520,50 @@ msgstr "/_Hilfe/---"
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten in den Papierkörben?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3568,16 +3573,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3586,145 +3591,145 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Markiere als Spam-Mail"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 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:2580
+#: src/mainwindow.c:2606
 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:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3781,24 +3786,24 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "Diese Nachricht wird mit dem folgenden Befehl gedruckt:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3964,11 +3969,11 @@ msgstr "Accounteinstellungen"
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privat"
 
@@ -3976,7 +3981,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Speziell"
 
@@ -4100,7 +4105,7 @@ msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4141,8 +4146,8 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4469,86 +4474,86 @@ msgstr "Aktion löschen"
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Erstelle Allgemeine-Einstellungenfenster...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Spam-Mail"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr "Details"
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatische Aktualisierung"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "jedes"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Hole neue E-Mail beim Programmstart"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Aktualisiere alle lokalen Ablagen nach dem Empfang"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr ""
 "Ausführen des folgenden Befehls, wenn neue Nachrichten empfangen wurden"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Befehl"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "'%d' wird ersetzt durch die Anzahl der neuen Nachrichten."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Übernehme aus lokaler Mailboxdatei"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtern beim Empfang"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Pfad zur Mailboxdatei"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Anwenden des Filters beim Versenden von Nachrichten"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Übertragungscodierung"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4556,161 +4561,161 @@ msgstr ""
 "Geben Sie den Übertragungs-Zeichensatz für den Nachrichteninhalt an, falls "
 "dieser Nicht-ASCII-Zeichen enthält."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Allgemein"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Automatisch einfügen"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Wähle automatisch den Account für die Antworten"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Zitiere Nachricht in der Antwort"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Starte externen Editor automatisch"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Stufen der Rückgängigmachung"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Bei der Eingabe umbrechen"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 msgid "Auto-save to draft"
 msgstr "Automatisch als Entwurf speichern"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 msgid "Format"
 msgstr "Format"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr "Rechtschreibprüfung"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Antwort-Format"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Weiterleiten-Format"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr "Rechtschreibprüfung aktivieren"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 msgid "Default language:"
 msgstr "Standard-Sprache"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 msgid "Text font"
 msgstr "Text Font"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Ordneransicht"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Zeige Nachrichtenanzahl in der Ordneransicht"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Kürze Newsgroups länger als"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "Zeichen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Einträge... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 msgid "Default character encoding"
 msgstr "Standard-Zeichensatz"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Dies wird für Nachrichten mit fehlender Zeichenkodierung verwendet."
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 msgid "Outgoing character encoding"
 msgstr "Standard-Zeichensatz beim Versenden"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4718,11 +4723,11 @@ msgstr ""
 "Wenn 'Automatisch' gewählt ist, wird der optimale Zeichensatz für die "
 "aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4730,79 +4735,79 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Wandle HTML Nachrichten um in Nur-Text"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Zeige Cursor in der Nachrichtenansicht an"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Große angehängte Bilder in das Fenster einpassen"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Zeige Bilder eingebettet an"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Aktiviere Spam-Mail Kontrolle"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Lerne Befehl:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 msgid "(Select preset)"
 msgstr "(Wähle Voreinstellung)"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Kein Spam"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Klassifizier-Befehl"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4810,188 +4815,193 @@ msgstr ""
 "Um Spam-Mails automatisch zu klassifizieren, müssen sowohl Spam- als auch "
 "Nicht-Spam-Mails eine Wile manuell gelernt werden."
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Spam-Mail Ablage"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Nachrichten, die als Spam-Mails markiert wurden, werden in diese Ablage "
 "verschoben."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr ""
 "Nachrichten beim Empfang ausfiltern, wenn sie als Spam-Mails erkannt wurden"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 msgid "Delete junk mails from server on receiving"
 msgstr "Spam-Mails während des Empfangens entfernen"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr "Markiere gefilterte Spam-Mails als gelesen"
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr ""
 "Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem POPUP-"
 "Fenster an"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Läuft aus nach"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0' speichert das Mantra für die gesamte\n"
 "Sitzung)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer in der Zusammenfassung öffnen, wenn ausgewählt"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster geöffnet "
 "werden"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Nachricht wird markiert bis zur Ausführung,\n"
 " wenn dies ausgeschaltet ist)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordnen der Buttons kompatibel zu GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Namen anzeigen"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen wählen... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Weiteres"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 msgid "External commands"
 msgstr "Externe Befehle"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schließen nach Beendigung"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Standardbrowser)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Benutze externes Programm zum Senden"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Aktiviere strengen Integritätstest des Summen-Zwischenspeichers"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5001,263 +5011,263 @@ msgstr ""
 "Inhalt von Ablagen verändern könnten.\n"
 "Diese Option verringert die Performance der Summen-Anzeige."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 msgid "Western European (Windows-1252)"
 msgstr "Western European (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebräisch (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebräiisch (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Einfaches Chinesisch (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5281,11 +5291,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5299,7 +5309,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5311,19 +5321,19 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "Voreingestellte Tastenkombinationen wählen."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
@@ -5651,19 +5661,19 @@ msgstr "Anhang"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6341,97 +6351,97 @@ msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr."
 
@@ -6452,7 +6462,7 @@ msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
@@ -6489,6 +6499,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Senden wartender Nachrichten"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Über"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Beenden"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Ablage-Eigenschaften"
diff --git a/po/el.po b/po/el.po
index d069693d..6ef549b7 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -513,7 +513,7 @@ msgstr "Βρέθηκε %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Κατάλογος"
@@ -979,8 +979,8 @@ msgstr "/Νέος κατάλογος"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -999,7 +999,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1010,7 +1010,7 @@ msgstr "Όνομα:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1059,7 +1059,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -1165,7 +1165,7 @@ msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Διεπαφή"
 
@@ -1186,7 +1186,7 @@ msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Κατάλογος"
@@ -1264,7 +1264,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Τέλος"
 
@@ -1277,7 +1277,7 @@ msgid "/_Remove"
 msgstr "/Διαγραφή"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
@@ -1750,12 +1750,12 @@ msgstr "τύπος MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -1799,7 +1799,7 @@ msgstr "Προσάρτηση αρχείου"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Yπογραφή"
 
@@ -1808,8 +1808,8 @@ msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Συνθέτης"
 
@@ -1841,7 +1841,7 @@ msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
@@ -2075,12 +2075,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2098,7 +2098,7 @@ msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2253,44 +2253,44 @@ msgstr "Επιλογή καταλόγου"
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
@@ -2299,7 +2299,7 @@ msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%
 msgid "/Create _new folder..."
 msgstr "/Δημιουργία νέου καταλόγου..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
@@ -2308,7 +2308,7 @@ msgstr "/Μετονομασία καταλόγου..."
 msgid "/_Move folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Διαγραφή καταλόγου"
 
@@ -2317,7 +2317,7 @@ msgstr "/Διαγραφή καταλόγου"
 msgid "/Empty _trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
@@ -2327,21 +2327,21 @@ msgstr "Σύνθεση νέου μηνύματος"
 msgid "/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
@@ -2355,85 +2355,85 @@ msgstr "/Συνδρομή σε newsgroup..."
 msgid "/_Remove newsgroup"
 msgstr "/Διαγραφή newsgroup"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Δημιουργώ την απεικόνιση καταλόγων...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "αρ."
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2443,21 +2443,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2466,12 +2471,12 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2482,21 +2487,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2505,35 +2510,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -2669,7 +2674,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2691,7 +2696,7 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr ""
 
@@ -3705,52 +3710,52 @@ msgstr "/Βοήθεια/---"
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3761,16 +3766,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3779,156 +3784,156 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3990,25 +3995,25 @@ msgstr "Προσάρτηση"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4176,11 +4181,11 @@ msgstr "Κοινές Επιλογές"
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Μυστικότητα"
 
@@ -4188,7 +4193,7 @@ msgstr "Μυστικότητα"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
@@ -4321,7 +4326,7 @@ msgid "Authentication method"
 msgstr "Πιστοποίηση"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Αυτόματη"
 
@@ -4366,8 +4371,8 @@ msgstr "Δημιουργία Message-ID"
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr "Επεξεργασία..."
 
@@ -4688,825 +4693,830 @@ msgstr "Διαγραφή λογαριασμού"
 msgid "Do you really want to delete this action?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Δημιουργία παραθύρου κοινών επιλογών...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Κοινές επιλογές"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Εμφάνιση"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Κατάλογος"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Αυτόματος έλεγχος για νέα mail"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 #, fuzzy
 msgid "every"
 msgstr "Ποτέ"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "λεπτά"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Έλεγχος για νέο mail στην αρχή"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Ενημέρωση όλων των τοπικών καταλόγων μετά την λήψη"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Λήψη νέου mail"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Φιλτράρισμα κατά τη λήψη"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr ""
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Διαχωρισμός υπογραφής"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Αυτόματη εισαγωγή"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Αυτόματη επιλογή λογαριασμού για τις απαντήσεις"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Παράθεση του μηνύματος όταν απαντάτε"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Απάντηση σε όλους"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Αυτόματη χρήση εξωτερικού προγράμματος επεξεργασίας"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Τύλιξη μηνυμάτων στους"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "χαρακτήρες"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Τύλιξη παράθεσης"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Προώθηση"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 #, fuzzy
 msgid "Reply format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Σήμα παράθεσης"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 #, fuzzy
 msgid "Forward format"
 msgstr "Προώθηση"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Περιγραφή συμβόλων"
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Κείμενο"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Κατάλογος"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 #, fuzzy
 msgid "letters"
 msgstr "Διαγραφή"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Απεικόνιση Περίληψης"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Εμφάνιση του παραλήπτη στη στήλη `Αποστολέα' αν ο αποστολέας είστε εσείς"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 #, fuzzy
 msgid "Expand threads"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Ορισμός εμφανιζόμενων στοιχείων περίληψης... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Display 2-byte alphabet and numeric with 1-byte character"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Διάστημα γραμμών"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Μισή σελίδα"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Ομαλή κύλιση"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Κατά βήματα"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ορισμός εμφάνισης κεφαλίδας"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Κατάλογος"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Εκτέλεση"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Επέλεξε κλειδιά"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Εκτέλεση"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Κατάλογος"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Διαγραφή news server"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Αυτόματος έλεγχος υπογραφών"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Εμφάνιση του αποτελέσματος του ελέγχου σε ξεχωριστό παράθυρο"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 #, fuzzy
 msgid "Expired after"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 #, fuzzy
 msgid "minute(s) "
 msgstr "λεπτά"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Grab input while entering a passphrase"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/Μήνυμα/Άνοιγμα σε νέο παράθυρο"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Μετακίνηση στον κατάλογο εισερχομένων μετά τη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Τα μηνύματα απλά θα σημανθούν μέχρι την εκτέλεση\n"
 "αν αυτό είναι απεπιλεγμένο)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Εμφανιζόμενο όνομα"
+
+#: src/prefs_common_dialog.c:2098
 #, fuzzy
 msgid " Set key bindings... "
 msgstr "Στέλνω"
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Άλλα"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Εκτέλεση"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Πάντα"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Κατά την έξοδο"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Επιβεβαίωση εξόδου"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Επιβεβαίωση πριν το άδειασμα"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Εξωτερικό πρόγραμμα σύνθεσης (το %s θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Αυτόματο (Προτεινόμενο)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Βαλτικής (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Βαλτικής (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "η συντομογραφία ημέρας της εβδομάδας"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "η συντομογραφία του μήνα"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "ο αριθμός αιώνα (έτη / 100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "τα τελευταία δύο ψηφία του έτους"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Όρισμος χρωμάτων μηνύματος"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5531,11 +5541,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5544,7 +5554,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5552,22 +5562,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 #, fuzzy
 msgid "Key bindings"
 msgstr "Στέλνω"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Στέλνω"
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 #, fuzzy
 msgid "Default"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5926,19 +5936,19 @@ msgstr "Προσάρτηση"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6642,101 +6652,101 @@ msgstr "\tΟρισμός περίληψης από τα δεδομένα του
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Αρ."
 
@@ -6759,7 +6769,7 @@ msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 msgid "Sa_ve this image as..."
 msgstr "/Αποθήκευση ως..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Σύνθεση νέου μηνύματος"
@@ -6795,6 +6805,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμούς"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Σχετικά"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Έξοδος"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Ιδιότητες"
diff --git a/po/es.po b/po/es.po
index 4bef0646..2c4b8904 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-07-08 21:08+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -510,7 +510,7 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -970,8 +970,8 @@ msgstr "/Nueva _carpeta"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -990,7 +990,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1001,7 +1001,7 @@ msgstr "Nombre:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1049,7 +1049,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1161,7 +1161,7 @@ msgstr "Error en la conversión de la agenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Carpeta"
@@ -1258,7 +1258,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ninguno"
 
@@ -1271,7 +1271,7 @@ msgid "/_Remove"
 msgstr "/_Quitar"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1703,12 +1703,12 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Enviar"
 
@@ -1750,7 +1750,7 @@ msgstr "Adjuntar fichero"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Firma"
 
@@ -1759,8 +1759,8 @@ msgid "Insert signature"
 msgstr "Insertar firma"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1788,7 +1788,7 @@ msgstr "El fichero no existe o está vacío."
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codificación"
 
@@ -2013,12 +2013,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2036,7 +2036,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2187,42 +2187,42 @@ msgstr "Seleccionar carpeta"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2231,7 +2231,7 @@ msgstr "No se puede crear la carpeta «%s»."
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
@@ -2239,7 +2239,7 @@ msgstr "/_Renombrar carpeta..."
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
@@ -2247,7 +2247,7 @@ msgstr "/_Borrar carpeta"
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
@@ -2255,20 +2255,20 @@ msgstr "/_Comprobar si hay mensajes nuevos"
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
@@ -2280,81 +2280,81 @@ msgstr "/_Suscribirse a un grupo..."
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Estableciendo información de carpeta...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucción del árbol de carpetas falló."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2364,21 +2364,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "No se puede eliminar la carpeta «%s»."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2387,12 +2392,12 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2405,21 +2410,21 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2428,34 +2433,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2580,7 +2585,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2601,7 +2606,7 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Antiguos de Sylpheed"
@@ -3523,51 +3528,51 @@ msgstr "/_Ayuda/---"
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3578,16 +3583,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3597,145 +3602,145 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3792,25 +3797,25 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Orden para aprender:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3974,11 +3979,11 @@ msgstr "Preferencias de la cuenta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -3986,7 +3991,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4111,7 +4116,7 @@ msgid "Authentication method"
 msgstr "Método de autentificación"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4152,8 +4157,8 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4483,85 +4488,85 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Creando ventana de preferencias comunes...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferencias comunes"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Correo basura"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Comprobar correo nuevo"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Comprueba correo nuevo al inicio"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todos las carpetas locales después de incorporar"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Ejecutar orden cuando lleguen nuevos mensajes"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Orden"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' será reemplazado con el número de nuevos mensajes."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Incorporar del almacén local"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrar al incorporar"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Ruta al almacén"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Guardar mensajes enviados en Salida"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Aplicar las reglas de filtrado a los mensajes enviados"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4569,169 +4574,169 @@ msgstr ""
 "Especificar la codificación de transferencia (Content-Transfer-Encoding) "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generales"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Separador de firma"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Insertar automáticamente"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente la cuenta para responder"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citar el mensaje al responder"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Guardar como borrador"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Buzón por defecto"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con más de"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4739,11 +4744,11 @@ msgstr ""
 "Si se selecciona `Automático' se utilizará la codificación óptima para la "
 "localización actual."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4751,259 +4756,264 @@ msgstr ""
 "Mostrar alfabéticos y numéricos multi-byte como\n"
 "caracteres ASCII (sólo para Japonés)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Mostrar los mensajes HTML como texto"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Mostrar el cursor en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Imágenes"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Mostrar las imágenes en el texto"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Activar el control del correo basura"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Orden para aprender:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Seleccione teclas"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "No basura"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Orden de clasificación"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Carpeta basura"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Los mensajes que se marquen como basura se moverán a esta carpeta."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensajes clasificados como basura al recibir"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar del servidor"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de firma"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Expirar después de"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Poniendo '0' mantendrá la contraseña durante toda la sesión."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contraseñas"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Los mensajes se marcarán hasta la ejecución si está desactivado."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordena los botones según la Guía de Interfaz de Usuario de GNOME"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Nombre mostrado"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Otras"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Ejecutar orden"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay errores de recepción"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción al finalizar"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble click"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Buzón por defecto"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activar la comprobación estricta de la integridad de la caché resumen"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5013,264 +5023,264 @@ msgstr ""
 "modificados por otras aplicaciones.\n"
 "Esta opción degradará el rendimiento al mostrar el resumen."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5294,11 +5304,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5312,7 +5322,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5324,20 +5334,20 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
@@ -5666,19 +5676,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Fecha"
 
@@ -6354,97 +6364,97 @@ msgstr "\tExtrayendo cabeceras de los mensajes..."
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "No."
 
@@ -6465,7 +6475,7 @@ msgstr "Este mensaje no puede visualizarse.\n"
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
@@ -6501,6 +6511,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Enviar mensaje(s) en la cola"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Acerca de"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Salir"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Propiedades de la carpeta"
diff --git a/po/et.po b/po/et.po
index 7775c4cf..1e17b14a 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -512,7 +512,7 @@ msgstr "Leiti %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Kaust"
@@ -972,8 +972,8 @@ msgstr "/Uus Kaust"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -992,7 +992,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1003,7 +1003,7 @@ msgstr "Nimi:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1164,7 +1164,7 @@ msgstr "Aadressiraamatu uuendamise viga"
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Kasutajaliides"
 
@@ -1185,7 +1185,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Kaust"
@@ -1261,7 +1261,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1274,7 +1274,7 @@ msgid "/_Remove"
 msgstr "/Eemalda"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -1737,12 +1737,12 @@ msgstr "MIME tüüp"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Saada"
 
@@ -1784,7 +1784,7 @@ msgstr "Manusta fail"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Allkiri"
 
@@ -1793,8 +1793,8 @@ msgid "Insert signature"
 msgstr "Lisa allkiri"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Redaktor"
 
@@ -1823,7 +1823,7 @@ msgstr "Faili ei eksisteeri või on see tühi."
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodeerimine"
 
@@ -2053,12 +2053,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2076,7 +2076,7 @@ msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2226,42 +2226,42 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2270,7 +2270,7 @@ msgstr "Ei suuda luua kausta %s."
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
@@ -2279,7 +2279,7 @@ msgstr "/Nimeta kaust ümbe_r..."
 msgid "/_Move folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
@@ -2288,7 +2288,7 @@ msgstr "/Kustuta kaust"
 msgid "/Empty _trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
@@ -2297,20 +2297,20 @@ msgstr "/_Vaata uusi kirju"
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
@@ -2323,84 +2323,84 @@ msgstr "/Telli uudi_stegrupp..."
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2410,21 +2410,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Ei suuda kausta %s eemaldada."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2433,12 +2438,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2449,21 +2454,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2472,34 +2477,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2624,7 +2629,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2645,7 +2650,7 @@ msgstr "Soome"
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
@@ -3587,52 +3592,52 @@ msgstr "/_Abi/---"
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3642,16 +3647,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3660,149 +3665,149 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3859,25 +3864,25 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4044,11 +4049,11 @@ msgstr "Konto omadused"
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privaatsus"
 
@@ -4056,7 +4061,7 @@ msgstr "Privaatsus"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
@@ -4183,7 +4188,7 @@ msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -4227,8 +4232,8 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4558,257 +4563,257 @@ msgstr "Kustuta tegevus"
 msgid "Do you really want to delete this action?"
 msgstr "Kas te tõesti soovite kustutada seda tegevust?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Loon üldiste omaduste akent...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Üldised omadused"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Ekraan"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Võta kirju"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "iga"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuti järel"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Võta uued kirjad töö alguses"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Käsklus"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Võta kirjad lokaalsest kirja jadast"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtreeri kirju nende võtmisel"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Pane saadetud kirjad kausta Saadetud"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Üldine"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Allkirja eraldaja"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Lisa automaatselt"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Vali vastuste jaoks konto automaatselt"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Kirjale vastamisel tsiteeri seda."
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Vasta nupp käivitab vastamise kirjalisti"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Käivita väline redaktor automaatselt"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Meelespeetavaid muudatusi"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Äärista kirjaread"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "sümboli laiuseks"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Äärista tsitaati"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Murra kõik pikad read sisestamisel"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Salvesta mustandite kausta"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normaalne"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Vastuse formaat"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Tsitaadi märk"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Edasta formaat"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Sümbolite seletus "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Vaikimisi kasutatab allkirja võti"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "lühenda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "tähte"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Määra kirjaloendis näidatavad elemendid... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Kiri"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4817,554 +4822,559 @@ msgstr ""
 "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Kirja värvimine lubatud"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Näita kirja päist ülalpool kirja vaadet"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Päise näitamine"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vali võtmed"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Kustuta kaust"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Säilita parooli ajutiselt mälus"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Aegub pärast"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Kui seada '0'-ks, siis parool salvesatakse\n"
 "kogu sessiooniks)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Kirjad lihtsalt märgitakse enne täitmit\n"
 " kui see on välja lülitatud)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Ekraani nimi"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Muud asjad"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Programmist väljumisel"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Kontrolli väljumist"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Tühjenda prügikast"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Küsi enne tühjendamist"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui järjekorras on kirju"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Kasuta välist programmi kirjade võtmiseks"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automaatne (Soovitatav)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitine ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unikood (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Lääne-Euroopa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Kesk Euroopa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5388,11 +5398,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5406,7 +5416,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5418,20 +5428,20 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
@@ -5788,19 +5798,19 @@ msgstr "Manus"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6473,99 +6483,99 @@ msgstr "\t sätin kokkuvõtte kirja andmetest..."
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Ei."
 
@@ -6588,7 +6598,7 @@ msgstr "kirja ei saanud\n"
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
@@ -6625,6 +6635,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Kiri/Võta _kõigilt kontodelt"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Kiri/Võta _kõigilt kontodelt"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Saada kirjad järjekorrast"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Sellest"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Välju"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Kausta omadus"
diff --git a/po/fr.po b/po/fr.po
index ee647987..b28f90c5 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-08-08 23:57+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -521,7 +521,7 @@ msgstr "Trouvé : %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -982,8 +982,8 @@ msgstr "/Nouveau _dossier"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -1002,7 +1002,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1013,7 +1013,7 @@ msgstr "Nom :"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1062,7 +1062,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1175,7 +1175,7 @@ msgstr "Erreur de conversion du carnet d'adresses"
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interface"
 
@@ -1196,7 +1196,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Dossier"
@@ -1272,7 +1272,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Aucun"
 
@@ -1285,7 +1285,7 @@ msgid "/_Remove"
 msgstr "/_Enlever"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -1717,12 +1717,12 @@ msgstr "Type MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Envoyer"
 
@@ -1764,7 +1764,7 @@ msgstr "Joindre un fichier"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Signature"
 
@@ -1773,8 +1773,8 @@ msgid "Insert signature"
 msgstr "Insérer la signature"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Éditeur de texte"
 
@@ -1802,7 +1802,7 @@ msgstr "Le fichier n'existe pas ou est vide."
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Encodage"
 
@@ -2030,12 +2030,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2053,7 +2053,7 @@ msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2204,42 +2204,42 @@ msgstr "Choix d'un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2248,7 +2248,7 @@ msgstr "Impossible de créer le dossier « %s »."
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
@@ -2256,7 +2256,7 @@ msgstr "/_Renommer le dossier..."
 msgid "/_Move folder..."
 msgstr "/_Déplacer le dossier..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
@@ -2264,7 +2264,7 @@ msgstr "/_Supprimer le dossier"
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
@@ -2272,20 +2272,20 @@ msgstr "/Re_chercher les nouveaux messages"
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
@@ -2297,82 +2297,82 @@ msgstr "/_Inscription aux groupes de discussion..."
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2382,21 +2382,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Impossible de supprimer le dossier « %s »."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2405,12 +2410,12 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2421,21 +2426,21 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être définitivement effacés.\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2444,34 +2449,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:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2598,7 +2603,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:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Suivant"
 
@@ -2619,7 +2624,7 @@ msgstr "Terminé"
 msgid "Sylpheed: %d new messages"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Ancien Sylpheed"
@@ -3550,51 +3555,51 @@ msgstr "/A_ide/---"
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3604,16 +3609,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:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3623,145 +3628,145 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 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:2580
+#: src/mainwindow.c:2606
 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:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3818,25 +3823,25 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Commande d'apprentissage :"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4000,11 +4005,11 @@ msgstr "Configuration du compte"
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -4012,7 +4017,7 @@ msgstr "Confidentialité"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avancée"
 
@@ -4137,7 +4142,7 @@ msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -4178,8 +4183,8 @@ msgstr "Génération d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4510,85 +4515,85 @@ msgstr "Supprimer l'action"
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Création de la fenêtre des préférences générales...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Préférences générales"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Affichage"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Courrier indésirable"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Relève automatique du courrier"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "chaque"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Relever le courrier au démarrage"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Mettre à jour tous les dossiers locaux après incorporation"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Exécuter la commande lors de l'arrivée de nouveaux messages"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Commande"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "« %d » sera remplacé par le nombre de nouveaux messages."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Incorporation à partir du spool local"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrage à l'incorporation"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Chemin du spool"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Appliquer les règles de filtrage aux messages envoyés"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Algo. de transmission"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4596,171 +4601,171 @@ msgstr ""
 "Précise le champ « Content-Transfer-Encoding » utilisé quand le corps du "
 "message contient des caractères non ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Général"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Insérer automatiquement"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Sélection automatique du compte lors d'une réponse"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citer le message en répondant"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton répondre agit pour la liste de diffusion"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur externe"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Justifier les messages à"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caractères"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Justifier la citation"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Justification automatique"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Justifier avant d'envoyer"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Citation lors d'une réponse"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Caractère de citation"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Citation lors d'un transfert"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Description des symboles "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Texte"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Dossier"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Afficher le nombre de messages non lus près du nom de dossier"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Afficher le nombre de messages non lus près du nom de dossier"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "lettres"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Résumé des messages"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
 "l'expéditeur du message"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Éléments affichés dans le résumé... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Message"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4768,11 +4773,11 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères optimal pour la "
 "langue utilisée sera choisi automatiquement."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4780,263 +4785,268 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caractères ASCII (Japonais seulement)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au dessus du message"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Afficher les messages HTML comme du texte"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Afficher le curseur dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Images"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Adapter les images aux dimensions de la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Afficher les images directement dans le message"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Activer la gestion des messages indésirables"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Commande d'apprentissage :"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Sélection de clés"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Commande de détection"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Dossier des indésirables"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Les messages marqués comme indésirables seront déplacés dans ce dossier."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Tri des messages détectés comme indésirables à la réception"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Effacer du serveur"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Afficher le résultat de la vérification dans une fenêtre"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Mémoriser temporairement la phrase secrète"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Expiration après"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Mettre 0 pour mémoriser la phrase secrète pendant toute la durée de la "
 "session."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Mettre les boutons en conformité avec les « HIG » GNOME"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Nom affiché"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Autres"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Exécuter la commande"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Message de réception"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception :"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr " toujours"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une relève manuelle du courrier"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr " jamais"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception à la fin"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Utiliser un programme externe pour l'incorporation"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Utiliser un programme externe pour l'envoi"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activer la vérification stricte de l'intégrité des caches d'index"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5046,264 +5056,264 @@ msgstr ""
 "programmes.\n"
 "Cette option réduira les performances d'affichage du résumé des messages."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Europe du Nord (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5327,11 +5337,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5345,7 +5355,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5357,20 +5367,20 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
@@ -5699,19 +5709,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Date"
 
@@ -6389,99 +6399,99 @@ msgstr "\tDéfinition de l'index à partir des données du message..."
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "N°"
 
@@ -6502,7 +6512,7 @@ msgstr "Impossible d'afficher ce message.\n"
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
@@ -6538,6 +6548,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Envoyer les messages en attente"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "À propos"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Quitter"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Propriétés du dossier"
diff --git a/po/gl.po b/po/gl.po
index 39586539..b00a4d88 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -509,7 +509,7 @@ msgstr "Atopado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Carpeta"
@@ -970,8 +970,8 @@ msgstr "/Nova _carpeta"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -990,7 +990,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1001,7 +1001,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1049,7 +1049,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1163,7 +1163,7 @@ msgstr "Erro na conversión da axenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Carpeta"
@@ -1260,7 +1260,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ningún"
 
@@ -1273,7 +1273,7 @@ msgid "/_Remove"
 msgstr "/_Quitar"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1736,12 +1736,12 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Enviar"
 
@@ -1783,7 +1783,7 @@ msgstr "Adxuntar ficheiro"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Sinatura"
 
@@ -1792,8 +1792,8 @@ msgid "Insert signature"
 msgstr "Inserir sinatura"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1821,7 +1821,7 @@ msgstr "O ficheiro non existe ou está valeiro."
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codificación"
 
@@ -2051,12 +2051,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2074,7 +2074,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2225,42 +2225,42 @@ msgstr "Directorio de almacén"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2269,7 +2269,7 @@ msgstr "Non se pode crear a carpeta `%s'."
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
@@ -2278,7 +2278,7 @@ msgstr "/_Renomear carpeta..."
 msgid "/_Move folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
@@ -2287,7 +2287,7 @@ msgstr "/_Borrar carpeta"
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
@@ -2295,20 +2295,20 @@ msgstr "/_Comprobar si hai mensaxes novas"
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
@@ -2321,82 +2321,82 @@ msgstr "/_Suscribirse a un grupo..."
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2406,21 +2406,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Non se pode eliminar a carpeta `%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2429,12 +2434,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2445,21 +2450,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2468,34 +2473,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2620,7 +2625,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2641,7 +2646,7 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
@@ -3586,52 +3591,52 @@ msgstr "/_Axuda/---"
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3642,16 +3647,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3661,149 +3666,149 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3860,25 +3865,25 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4045,11 +4050,11 @@ msgstr "Preferencias da conta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -4057,7 +4062,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4184,7 +4189,7 @@ msgid "Authentication method"
 msgstr "Método de autenticación"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4228,8 +4233,8 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4556,88 +4561,88 @@ msgstr "Borrar acción"
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quere borrar esta acción?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Creando fiestra de preferencias comuns...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferencias comuns"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Comprobar correo novo"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Comproba correo novo ó inicio"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todas as carpetas locales despois de incorporar"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Obtendo o número de novas mensaxes (asT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Incorporar do almacén"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrar ó incorporar"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Gardar mensaxes enviados en Saida"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4646,169 +4651,169 @@ msgstr ""
 "Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
 "cando o corpo do mensaxe conten caracteres non-ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Xerais"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Separador de sinatura"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Inserir automáticamente"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente a conta para respostar"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citar a mensaxe ó respostar"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "o botón Respostar invoca respostar á lista de correo"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Lanzar o editor externo automáticamente"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Niveles de desfacer"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Recortar mensaxes ós"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Recortar mentras se escribe"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Gardar como borrador"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Mensaxe"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4817,11 +4822,11 @@ msgstr ""
 "Si se selecciona `Automático' utilizarase a\n"
 "codificación óptima para a localización actual."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4829,542 +4834,547 @@ msgstr ""
 "Mostrar alfabéticos e numéricos multi-byte como\n"
 "caracteres ASCII (só para Xaponés)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Media páxina"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as imáxes adxuntas"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Seleccione teclas"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar carpeta"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas automáticamente"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de sinatura"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendrá a contraseña\n"
 " durante toda a sesión)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Os mensaxes marcaránse hasta a execución\n"
 " si está desactivado)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Nome mostrado"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Outras"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrar diálogo de erro si hai erros de recepción"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción ó finalizar"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir dirección ó destino con doble click"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Ó sair"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Confirmar ó sair"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira ó sair"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como número usando o reloxo de 24 horas"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como número usando o reloxo de 12 horas"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5388,11 +5398,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5406,7 +5416,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5418,20 +5428,20 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
@@ -5786,19 +5796,19 @@ msgstr "Adxunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6470,99 +6480,99 @@ msgstr "\tExtraindo cabeceiras das mensaxes..."
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Non."
 
@@ -6585,7 +6595,7 @@ msgstr "unha mensaxe non será recibido\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
@@ -6622,6 +6632,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Mensaxe/Recibir de tod_as as contas"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Mensaxe/Recibir de tod_as as contas"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Enviar mensaxe(s) na cola"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Acerca de"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Sair"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Propiedades da carpeta"
diff --git a/po/hr.po b/po/hr.po
index 9b600ec1..023dbcac 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -515,7 +515,7 @@ msgstr "Pronađen %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Spis"
@@ -975,8 +975,8 @@ msgstr "/Novi _spis"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -995,7 +995,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1006,7 +1006,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1054,7 +1054,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1160,7 +1160,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Spis"
@@ -1258,7 +1258,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ništa"
 
@@ -1271,7 +1271,7 @@ msgid "/_Remove"
 msgstr "/_Ukloni"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -1744,12 +1744,12 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Pošalji"
 
@@ -1791,7 +1791,7 @@ msgstr "Priloži datoteku"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Potpis"
 
@@ -1800,8 +1800,8 @@ msgid "Insert signature"
 msgstr "Unesi potpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Uređivač"
 
@@ -1831,7 +1831,7 @@ msgstr "Datoteka ne postoji ili je prazna."
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodiranje"
 
@@ -2062,12 +2062,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2085,7 +2085,7 @@ msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2235,44 +2235,44 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2281,7 +2281,7 @@ msgstr "Ne mogu stvoriti spis `%s'."
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
@@ -2290,7 +2290,7 @@ msgstr "/_Preimenuj spis..."
 msgid "/_Move folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Obriši spis"
 
@@ -2299,7 +2299,7 @@ msgstr "/_Obriši spis"
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove pošte"
@@ -2309,20 +2309,20 @@ msgstr "Kreiranje nove pošte"
 msgid "/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
@@ -2335,85 +2335,85 @@ msgstr "/Pribilježi se na _news grupu..."
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2423,21 +2423,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Ne mogu premjestiti spis `%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2446,12 +2451,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2462,21 +2467,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2485,35 +2490,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2648,7 +2653,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2671,7 +2676,7 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr ""
 
@@ -3683,52 +3688,52 @@ msgstr "/_Pomoć/---"
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3739,16 +3744,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3757,152 +3762,152 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3961,25 +3966,25 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4146,11 +4151,11 @@ msgstr "Postavke računa"
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -4158,7 +4163,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4288,7 +4293,7 @@ msgid "Authentication method"
 msgstr "Autorizacija"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr ""
 
@@ -4333,8 +4338,8 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4654,260 +4659,260 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Stvaram prozor za uobičajene postavke...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Uobičajene postavke"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Auto-provjera nove pošte"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Provjeri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Osvježi sve spise poslije prihvaćanja"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvaćanju"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr ""
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Razdjelnik potpisa"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi račun pri odgovaranju"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Odgovori svi_ma"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni vanjski uređivač"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 #, fuzzy
 msgid "Wrap on input"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Proslijedi"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Format prosljeđivanja"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Stalni ključ potpisa"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 #, fuzzy
 msgid "letters"
 msgstr "Obriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Pošta"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4916,557 +4921,562 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišten."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši spis"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 #, fuzzy
 msgid "Expired after"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka neće biti primljena\n"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Pošta/O_tvori u novom prozoru"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sandučić nakon primanja pošte"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Prikaz imena"
+
+#: src/prefs_common_dialog.c:2098
 #, fuzzy
 msgid " Set key bindings... "
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Pitaj prije pražnjenja"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Koristi vanjski program za prihvat"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Europski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5490,11 +5500,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5503,7 +5513,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5511,22 +5521,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5883,19 +5893,19 @@ msgstr "Prilog"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6585,99 +6595,99 @@ msgstr "\tPostavljam pregled od podataka poruke..."
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Ne."
 
@@ -6700,7 +6710,7 @@ msgstr "poruka neće biti primljena\n"
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
@@ -6736,6 +6746,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Pošta/Primi poštu sa _svih računa"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Pošta/Primi poštu sa _svih računa"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Šalje odložene poruke"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Izlaz"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Postavke"
diff --git a/po/hu.po b/po/hu.po
index 67b00fd7..99c21375 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-12-27 11:05+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -510,7 +510,7 @@ msgstr "Találat %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrő"
 
@@ -973,8 +973,8 @@ msgstr "/Ú_j Mappa"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -993,7 +993,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1004,7 +1004,7 @@ msgstr "Név:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1052,7 +1052,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1160,7 +1160,7 @@ msgstr "Címjegyzék konverziós hiba"
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Illesztő"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Mappa"
@@ -1257,7 +1257,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Semmi"
 
@@ -1270,7 +1270,7 @@ msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
@@ -1699,12 +1699,12 @@ msgstr "MIME típus"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Küldés"
 
@@ -1746,7 +1746,7 @@ msgstr "Fájl csatolása"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Aláírás"
 
@@ -1755,8 +1755,8 @@ msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Szerkesztő"
 
@@ -1784,7 +1784,7 @@ msgstr "A fájl nem létezik vagy üres."
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kódolás"
 
@@ -2008,12 +2008,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2031,7 +2031,7 @@ msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2180,42 +2180,42 @@ msgstr "Könyvtár választása"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2224,7 +2224,7 @@ msgstr "`%s' nem hozható létre."
 msgid "/Create _new folder..."
 msgstr "/Új _mappa létrehozása..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Mappa át_nevezése..."
 
@@ -2232,7 +2232,7 @@ msgstr "/Mappa át_nevezése..."
 msgid "/_Move folder..."
 msgstr "/Mappa át_helyezése..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Mappa _törlése"
 
@@ -2240,7 +2240,7 @@ msgstr "/Mappa _törlése"
 msgid "/Empty _trash"
 msgstr "/_Kuka ürítése"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Ú_j üzenetek ellenőrzése"
 
@@ -2248,19 +2248,19 @@ msgstr "/Ú_j üzenetek ellenőrzése"
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa újraépítése"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 msgid "/_Update summary"
 msgstr "/Ö_sszegzés frissítése"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Ü_zenetek keresése..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Le_töltés"
 
@@ -2272,81 +2272,81 @@ msgstr "/Hírcsoport _előfizetése..."
 msgid "/_Remove newsgroup"
 msgstr "/Hírcsoport e_ltávolítása"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2356,21 +2356,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "`%s' nem távolítható el."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2379,12 +2384,12 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Mappa törlése"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2397,20 +2402,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2424,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:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2571,7 +2576,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Következő"
 
@@ -2592,7 +2597,7 @@ msgstr "Vége"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új üzenet"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3512,50 +3517,50 @@ msgstr "/Sú_gó/---"
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3565,16 +3570,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3583,146 +3588,146 @@ 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:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 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:2580
+#: src/mainwindow.c:2606
 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:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3779,24 +3784,24 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3963,11 +3968,11 @@ msgstr "Hozzáférés beállítások"
 msgid "Creating account preferences window...\n"
 msgstr "Hozzáférésbeállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Magánszféra"
 
@@ -3975,7 +3980,7 @@ msgstr "Magánszféra"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Haladó"
 
@@ -4099,7 +4104,7 @@ msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -4139,8 +4144,8 @@ msgstr "Üzenet-azonosító generálása"
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
@@ -4470,85 +4475,85 @@ msgstr "Művelet törlése"
 msgid "Do you really want to delete this action?"
 msgstr "Tényleg töröljem ezt a műveletet?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Általános beállítások ablak létrehozása...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Általános beállítások"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Levélszemét"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr "Részletek"
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatikus levélfigyelés"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "minden"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "perc"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Új levelek ellenőrzése induláskor"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Fogadás után minden helyi mappa frissítése"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Parancs végrehajtása, ha új üzenet érkezett"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Parancs"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "A `%d' helyére az új üzenetek száma kerül."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Fogadás helyi tárolóból"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Szűrés fogadás közben"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Tároló elérési útja"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Elküldött üzenetek mentése a Kimenő postafiókba"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Szűrőszabályok alkalmazása az elküldött üzenetekre"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Átvitel kódolása"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4556,163 +4561,163 @@ msgstr ""
 "Határozza meg a Content-Transfer-Encoding értékét, ha az üzenet tartalmaz "
 "nem-ASCII karaktereket is."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Általános"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Automatikus beillesztés"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automatikus hozzáférés választás válaszkor"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Üzenet idézése a válaszban"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Visszavonás mélysége"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Sortörés helye"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Idézet törése"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Bevitel tördelése"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Sortördelés küldés előtt"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 msgid "Auto-save to draft"
 msgstr "Automatikus mentés a vázlat mappába"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 msgid "Format"
 msgstr "Formátum"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr "Helyesírásellenőrzés"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Válasz formátuma"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Idézet jele"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Továbbítás formátuma"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Szimbólumok leírása "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr "Helyesírásellenőrzés bekapcsolása"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 msgid "Default language:"
 msgstr "Alapértelmezett nyelv:"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 msgid "Text font"
 msgstr "Szöveg betűkészlete"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Mappanézet"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Mappanézetben jelenítse meg az üzenet számainak oszlopát"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "levél"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Összefoglaló nézet"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Dátum formátuma"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Összefoglalás kijelzésének beállítása... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 msgid "Default character encoding"
 msgstr "Alapértelmezett karakterkódolás"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Ezt használja a program olyan üzenetek megjelenítéséhez, amiben nincs "
 "megadva 'character encoding' sor."
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 msgid "Outgoing character encoding"
 msgstr "Kimenő üzenetek karakterkódolása"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4720,11 +4725,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást használja "
 "a helyi nyelvi beállításoknak megfelelően."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Színek használata az üzenetekhez"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4732,79 +4737,79 @@ msgstr ""
 "Több byte-os karakterek és számok megjelenítése\n"
 "ASCII karakterekkel (csak japán esetén)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Fejlécmező megjelenítése az üzenet fölött"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Rövid fejlécek az üzenet nézetben"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "HTML üzenet értelmezése szövegként"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Kurzor megjelenítése üzenet nézetben"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Sortávolság"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "Képpont"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Fél oldal"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Finom görgetés"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Lépés"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Képek"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "A nagy méretű csatolt képek ablakméretre igazítása"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Képek megjelenítése egyvonalban"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Levélszemét szabályozás engedélyezése"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Tanítás parancs:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 msgid "(Select preset)"
 msgstr "(Beállítás választás)"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Nem levélszemét"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Osztályozó parancs"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4812,180 +4817,185 @@ msgstr ""
 "A levélszemét automatikus osztályozásánál, egy bizonyos mértékig kézzel kell "
 "tanítani a levélszemét és a levél válogatását."
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Levélszemét mappa"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Azon üzenetek, melyek levélszemétként lettek beállítva törlődni fognak ebből "
 "a mappából."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "A fogadáskor megszűrt üzenetek levélszemétként osztályozva"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 msgid "Delete junk mails from server on receiving"
 msgstr "Levélszemét törlése a szerverről fogadáskor"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr "Szűrt jelölés a levélszemétre olvasáskor"
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Digitális aláírás automatikus ellenőrzése"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes tárolása a memóriában"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Lejár ennyi után"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0'-ra állítva tárolja a jelmondatot a teljes menet alatt."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkapása egy jelmondat beadásakor"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Az üzenetek mindig összefoglalva jelennek meg, ha ez kiválasztott"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Mappába lépéskor az első olvasatlan üzenet megnyitása"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az új ablakban megnyitott üzeneteket jelölje olvasottként."
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Váltson a bejövő postafiókra email fogadás után"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali végrehajtás üzenet mozgatás vagy törlés esetén"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Az üzenetek kijelölten láthatók a feldolgozás alatt, ha ez ki van kapcsolva."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "A gombrendszer elkészítése a GNOME HIG szerint"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Név kijelzése"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Billentyű hozzárendelések... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Egyéb"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 msgid "External commands"
 msgstr "Külső parancsok"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Fogadó ablak"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Fogadó ablak mutatása"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Csak kézi fogadáskor"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Fogadó ablak bezárása ha végzett"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Kilépéskor"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Ürítés előtt rákérdez"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen üzenetek esetén figyelmeztet"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Alapértelmezett böngésző)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Külső program használata email fogadáshoz"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Külső program használata küldéshez"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Összefoglaló gyorstár sértetlenségének pontos ellenőrzése"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -4995,263 +5005,263 @@ msgstr ""
 "alkalmazás módosíthatja.\n"
 "Ez az opció lassítja az összefoglalás megjelenésének idejét."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Hálózati adatátvitel időtúllépés:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "másodperc"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatikus (Ajánlott)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bites ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Nyugat Európai (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 msgid "Western European (Windows-1252)"
 msgstr "Nyugat Európai (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Közép Európai (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikumi (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikumi (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Héber (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Héber (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirill (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Egyszerűsített Kínai (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "óra számként (24 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "óra számként (12 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Üzenetszín beállítása"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5275,11 +5285,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Üzenet-azonosító"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5293,7 +5303,7 @@ msgstr ""
 "Idézett üzenet törzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5305,19 +5315,19 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "Válasszon a beállított billentyű hozzárendelésekből."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
@@ -5643,19 +5653,19 @@ msgstr "Csatolás"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Dátum"
 
@@ -6320,97 +6330,97 @@ msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Db"
 
@@ -6431,7 +6441,7 @@ msgstr "Ez az üzenet nem jeleníthető meg.\n"
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Ú_j üzenet szerkesztése"
 
@@ -6467,6 +6477,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Üzenet/Fog_adás/_Jelenlegi hozzáférésről"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Várakozó sorból üzenet(ek) küldése"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Névjegy"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Kilépés"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Mappa tulajdonságai"
diff --git a/po/it.po b/po/it.po
index 27d7bd9c..bf2ace59 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-12-15 19:09+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -510,7 +510,7 @@ msgstr "Trovato %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
@@ -972,8 +972,8 @@ msgstr "/Nuova _cartella"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -992,7 +992,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1003,7 +1003,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1052,7 +1052,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1164,7 +1164,7 @@ msgstr "Errore di conversione della rubrica"
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interfaccia"
 
@@ -1185,7 +1185,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Cartella"
@@ -1261,7 +1261,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Niente"
 
@@ -1274,7 +1274,7 @@ msgid "/_Remove"
 msgstr "/_Rimuovi"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
@@ -1706,12 +1706,12 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Invia"
 
@@ -1753,7 +1753,7 @@ msgstr "Allega il file"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Firma"
 
@@ -1762,8 +1762,8 @@ msgid "Insert signature"
 msgstr "Inserisce la firma"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1791,7 +1791,7 @@ msgstr "Il file non esiste o è vuoto."
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codifica"
 
@@ -2016,12 +2016,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2039,7 +2039,7 @@ msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2189,42 +2189,42 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2233,7 +2233,7 @@ msgstr "Impossibile creare la cartella «%s»."
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
@@ -2241,7 +2241,7 @@ msgstr "/_Rinomina cartella..."
 msgid "/_Move folder..."
 msgstr "/_Sposta cartella..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
@@ -2249,7 +2249,7 @@ msgstr "/_Elimina cartella"
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
@@ -2257,19 +2257,19 @@ msgstr "/_Controllo nuovi messaggi"
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 msgid "/_Update summary"
 msgstr "/A_ggiorna sommario"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
@@ -2281,81 +2281,81 @@ msgstr "/_Iscrizione newsgroup..."
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2365,21 +2365,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Impossibile rimuovere la cartella «%s»."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2388,12 +2393,12 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2407,20 +2412,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2429,34 +2434,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2581,7 +2586,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Successivo"
 
@@ -2602,7 +2607,7 @@ msgstr "Fine"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3523,50 +3528,50 @@ msgstr "/A_iuto/---"
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3576,16 +3581,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3595,145 +3600,145 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3790,24 +3795,24 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "Il messaggio sarà stampato con il seguente comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3973,11 +3978,11 @@ msgstr "Preferenze dell'account"
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3985,7 +3990,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avanzato"
 
@@ -4110,7 +4115,7 @@ msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -4150,8 +4155,8 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4481,85 +4486,85 @@ msgstr "Elimina l'azione"
 msgid "Do you really want to delete this action?"
 msgstr "Eliminare questa azione?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Creazione della finestra delle preferenze comuni...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferenze comuni"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Mail spazzatura"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Controllo automatico nuova posta"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "ogni"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuto(i)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Controlla se c'è nuova posta all'avvio"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Esegui il comando quando arrivano nuovi messaggi"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "«%d» sarà sostituito con il numero dei nuovi messaggi."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Incorpora dallo spool locale"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtra quando incorpori"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Percorso dello spool"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Salva i messaggi inviati nella cartella «Inviata»"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Applica le regole del filtro nell'inviare i messaggi"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Codifica di trasferimento"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4567,163 +4572,163 @@ msgstr ""
 "Specificare il contenuto della codifica di trasferimento usata quando il "
 "corpo del messaggio contiene dei caratteri non-ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Generale"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Separatore della firma"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Inserisci automaticamente"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Seleziona automaticamente l'account per le risposte"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Cita il messaggio quando rispondi"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Lancia automaticamente l'editor esterno"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Livello di annulla"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Vai a capo nei messaggi dopo"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caratteri"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "A capo nella citazione"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "A capo durante l'input"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "A capo prima dell'invio"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 msgid "Auto-save to draft"
 msgstr "Salvataggio automatico nelle bozze"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 msgid "Format"
 msgstr "Formato"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr "Controllo ortografico"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formato della risposta"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formato di inoltro"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Descrizione dei simboli "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr "Abilita controllo ortografico"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 msgid "Default language:"
 msgstr "Lingua predefinita:"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 msgid "Text font"
 msgstr "Carattere del testo"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Vista cartella"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Mostra le colonne del numero dei messaggi nella vista cartella"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup più lunghi di"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "lettere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 msgid "Default character encoding"
 msgstr "Codifica caratteri predefinita"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Viene usato quando si visualizzano messaggi con la codifica caratteri "
 "mancante."
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 msgid "Outgoing character encoding"
 msgstr "Codifica caratteri in uscita"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4731,11 +4736,11 @@ msgstr ""
 "Selezionando «Automatico» verrà usata la codifica ottimale per la località "
 "attuale."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4743,79 +4748,79 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Trasforma i messaggi HTML come testo."
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Mostra il cursore nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Immagini"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Mostra immagini in linea"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Abilita il controllo della mail spazzatura"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Comando di apprendimento:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 msgid "(Select preset)"
 msgstr "(seleziona predefinito)"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Normale"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Comando di classificazione"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4824,182 +4829,187 @@ msgstr ""
 "spazzatura e non spazzatura devono essere apprese manualmente per un certo "
 "periodo."
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Cartella spazzatura"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "I messaggi impostati come mail spazzatura saranno spostati in questa "
 "cartella."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtra in ricezione i messaggi classificati come spazzatura"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 msgid "Delete junk mails from server on receiving"
 msgstr "Elimina le mail spazzatura dal server in ricezione"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr "Segna le mail spazzatura filtrate come lette"
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Impostando a «0» si conserverà la passphrase per l'intera sessione"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Apri il primo messaggio non letto quando entri in una cartella"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Segna il messaggio come letto solo quando è aperto in una nuova finestra"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "I messaggi verranno solo segnati fino all'esecuzione se questa è inattiva."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Disposizione dei pulsanti conforme con lo GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Nome da visualizzare"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Altro"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 msgid "External commands"
 msgstr "Comandi esterni"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Browser predefinito)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Usa un programma esterno per incorporare la posta"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Usa il programma esterno per l'invio"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Abilita il controllo stretto dell'integrità delle cache del sommario"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5009,264 +5019,264 @@ msgstr ""
 "modificati da altre applicazioni.\n"
 "Questa opzione degraderà le prestazioni della visualizzazione del sommario."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatica (Raccomandata)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII a 7 bit (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Ebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Cinese semplificato (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5290,11 +5300,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5308,7 +5318,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5320,19 +5330,19 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "Impostazione delle associazioni dei tasti."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
@@ -5660,19 +5670,19 @@ msgstr "Allegato"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6343,97 +6353,97 @@ msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "No."
 
@@ -6454,7 +6464,7 @@ msgstr "Questo messaggio non può essere visualizzato.\n"
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Componi un _nuovo messaggio"
 
@@ -6491,6 +6501,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Invia i messaggi accodati"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Informazioni"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Esci"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Proprietà della cartella"
diff --git a/po/ja.po b/po/ja.po
index 3843bd28..519070d5 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -509,7 +509,7 @@ msgstr "%s が見つかりました\n"
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
@@ -969,8 +969,8 @@ msgstr "/新規フォルダ(_F)"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -989,7 +989,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -1000,7 +1000,7 @@ msgstr "名前:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1048,7 +1048,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1158,7 +1158,7 @@ msgstr "アドレス帳変換エラー"
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "インタフェース"
 
@@ -1179,7 +1179,7 @@ msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "フォルダ"
@@ -1255,7 +1255,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "なし"
 
@@ -1268,7 +1268,7 @@ msgid "/_Remove"
 msgstr "/削除(_R)"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
@@ -1696,12 +1696,12 @@ msgstr "MIME タイプ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "送信"
 
@@ -1743,7 +1743,7 @@ msgstr "ファイルを添付"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "署名"
 
@@ -1752,8 +1752,8 @@ msgid "Insert signature"
 msgstr "署名を挿入"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "エディタ"
 
@@ -1781,7 +1781,7 @@ msgstr "ファイルが存在しないかまたは空です。"
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "エンコーディング"
 
@@ -2005,12 +2005,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2028,7 +2028,7 @@ msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2177,42 +2177,42 @@ msgstr "ディレクトリの選択"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
@@ -2221,7 +2221,7 @@ msgstr "フォルダ `%s' を作成できません。"
 msgid "/Create _new folder..."
 msgstr "/新規フォルダを作成(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/フォルダ名を変更(_R)..."
 
@@ -2229,7 +2229,7 @@ msgstr "/フォルダ名を変更(_R)..."
 msgid "/_Move folder..."
 msgstr "/フォルダを移動(_M)..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/フォルダを削除(_D)"
 
@@ -2237,7 +2237,7 @@ msgstr "/フォルダを削除(_D)"
 msgid "/Empty _trash"
 msgstr "/ごみ箱を空にする(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/新着メッセージをチェック(_C)"
 
@@ -2245,19 +2245,19 @@ msgstr "/新着メッセージをチェック(_C)"
 msgid "/R_ebuild folder tree"
 msgstr "/フォルダツリーを再構築(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 msgid "/_Update summary"
 msgstr "/サマリを更新(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/メッセージを検索(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr "/検索条件を編集(_I)..."
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/ダウンロード(_L)"
 
@@ -2269,81 +2269,81 @@ msgstr "/ニュースグループを購読(_B)..."
 msgid "/_Remove newsgroup"
 msgstr "/ニュースグループを削除(_R)"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "総数"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2353,21 +2353,26 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "フォルダ '%s' の名前を変更できません。"
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2376,11 +2381,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2393,20 +2398,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2415,34 +2420,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2567,7 +2572,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "次へ"
 
@@ -2588,7 +2593,7 @@ msgstr "完了"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 通の新着メッセージ"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3507,50 +3512,50 @@ msgstr "/ヘルプ(_H)/---"
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3559,16 +3564,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3577,145 +3582,145 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3772,24 +3777,24 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3955,11 +3960,11 @@ msgstr "アカウントの設定"
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "個人情報"
 
@@ -3967,7 +3972,7 @@ msgstr "個人情報"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "高度な設定"
 
@@ -4091,7 +4096,7 @@ msgid "Authentication method"
 msgstr "認証方式"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "自動"
 
@@ -4131,8 +4136,8 @@ msgstr "メッセージIDを生成する"
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " 編集... "
 
@@ -4460,85 +4465,85 @@ msgstr "アクションの削除"
 msgid "Do you really want to delete this action?"
 msgstr "本当にこのアクションを削除してもいいですか?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "全般プリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "全般の設定"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "表示"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "迷惑メール"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr "詳細"
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "新着メールを自動チェックする"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr " "
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "分ごと"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "起動時に新着メールをチェックする"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "受信後にすべてのローカルフォルダを更新する"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "新着メッセージが到着したらコマンドを実行する"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "コマンド"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' は新着メッセージ数で置き換えられます。"
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "ローカルスプールから取り込む"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "取込時に振り分ける"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "スプールのパス"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "送信したメッセージを送信控に保存する"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "送信したメッセージにフィルタルールを適用する"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "転送符号化方式"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4546,162 +4551,162 @@ msgstr ""
 "メッセージ本文が ASCII 文字以外を含む場合に使用する Content-Transfer-"
 "Encoding を指定してください。"
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "署名の区切り"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "自動的に挿入する"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "返信時に自動的にアカウントを選択する"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "返信時にメッセージを引用する"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "返信ボタンでメーリングリストに返信する"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "外部エディタを自動的に起動する"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "アンドゥの回数"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "メッセージを半角"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "文字で改行"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "引用部を自動整形する"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "入力時に自動整形する"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "送信時に自動整形する"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 msgid "Auto-save to draft"
 msgstr "草稿に自動保存する"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 msgid "Format"
 msgstr "書式"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr "スペルチェック"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "返信の書式"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "引用符"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "転送の書式"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " 記号の説明 "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr "スペルチェックを有効にする"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 msgid "Default language:"
 msgstr "既定の言語:"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 msgid "Text font"
 msgstr "テキストフォント"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "フォルダビュー"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "フォルダ名の横に未読数を表示する"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "フォルダビューにメッセージ数のカラムを表示する"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "文字数が"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "字より長いニュースグループ名を簡略表示"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "サマリビュー"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "日付の書式"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " サマリの表示項目を設定... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 msgid "Default character encoding"
 msgstr "既定の文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "これはエンコーディングが未指定のメッセージを表示するときに使用されます。"
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 msgid "Outgoing character encoding"
 msgstr "送信文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4709,89 +4714,89 @@ msgstr ""
 "「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用さ"
 "れます。"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "メッセージの色を有効にする"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "メッセージビューの上部にヘッダペインを表示する"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "メッセージビューに簡略ヘッダを表示する"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "HTML メッセージを解釈してテキスト表示する"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "メッセージビューにカーソルを表示する"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "行間を空ける"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "ピクセル"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "半ページ単位"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "スムーズスクロール"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "間隔"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "画像"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "画像をインラインで表示する"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "迷惑メール対策を有効にする"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "学習コマンド:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 msgid "(Select preset)"
 msgstr "(プリセットを選択)"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "非迷惑メール"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "判定コマンド"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4799,178 +4804,182 @@ msgstr ""
 "迷惑メールを自動的に判定するには、迷惑メールと非迷惑メールの両方をある程度ま"
 "で手動で学習させる必要があります。"
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "迷惑メールフォルダ"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "迷惑メールに指定したメッセージをこのフォルダに移動します。"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "受信時に迷惑メールと判定されたメッセージを振り分ける"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 msgid "Delete junk mails from server on receiving"
 msgstr "受信時に迷惑メールをサーバから削除する"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr "振り分けた迷惑メールを既読にする"
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "署名を自動的に検証する"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "署名の検証結果をポップアップウィンドウで表示する"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "パスフレーズをメモリ上に一時的に記憶する"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "有効期間"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "分"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "パスフレーズの入力時に入力を捕捉する"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG が動作しない場合起動時に警告を表示する"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "サマリでメッセージを選択したとき常に開く"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "フォルダに入ったときに最初の未読メッセージを開く"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "新着メールを受信した後受信箱に移動する"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "メッセージを移動または削除したら即座に実行する"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "ボタンの配置をGNOME HIGに準拠"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+msgid "Display tray icon"
+msgstr "トレイアイコンを表示する"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " キーバインドを設定... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "その他"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 msgid "External commands"
 msgstr "外部コマンド"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "受信ダイアログ"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "受信ダイアログを"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "常に表示"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "手動で受信した場合のみ表示"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "表示しない"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "受信エラー時にエラーダイアログをポップアップしない"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "完了時に受信ダイアログを閉じる"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "終了時"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "終了時に確認する"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "終了時にごみ箱を空にする"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "空にする前に尋ねる"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "送信待機中のメッセージがあれば警告する"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(既定のブラウザ)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "メールの受信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "メールの送信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "サマリキャッシュの整合性を厳密にチェックする"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -4980,263 +4989,263 @@ msgstr ""
 "にしてください。\n"
 "このオプションはサマリ表示の性能を低下させます。"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "ソケット I/O のタイムアウト:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "自動設定 (推奨)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "欧米 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "欧米 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 msgid "Western European (Windows-1252)"
 msgstr "欧米 (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルト諸国 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルト諸国 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "ヘブライ語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "ヘブライ語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "キリル文字 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "簡体字中国語 (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5260,11 +5269,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5278,7 +5287,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5290,19 +5299,19 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr " キーバインドのプリセットを選択してください。"
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
@@ -5628,19 +5637,19 @@ msgstr "添付"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "日付"
 
@@ -6305,97 +6314,97 @@ msgstr "\tメッセージデータからサマリを設定中..."
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "番号"
 
@@ -6416,7 +6425,7 @@ msgstr "このメッセージは表示できません。\n"
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
@@ -6452,3 +6461,23 @@ msgstr ""
 #: src/textview.c:2090
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
+
+#: src/trayicon.c:95
+msgid "Get from _current account"
+msgstr "現在のアカウントから受信(_C)"
+
+#: src/trayicon.c:99
+msgid "Get from _all accounts"
+msgstr "全アカウントから受信(_A)"
+
+#: src/trayicon.c:103
+msgid "_Send queued messages"
+msgstr "送信待機中のメッセージを送信(_S)"
+
+#: src/trayicon.c:114
+msgid "_About"
+msgstr "このプログラムについて(_A)"
+
+#: src/trayicon.c:117
+msgid "E_xit"
+msgstr "終了(_X)"
diff --git a/po/ko.po b/po/ko.po
index 6d179aa6..858c6d90 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -512,7 +512,7 @@ msgstr "%s을 발견\n"
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "폴더"
@@ -961,8 +961,8 @@ msgstr "/새 폴더(_F)"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -981,7 +981,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "주소록"
 
@@ -992,7 +992,7 @@ msgstr "이름:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1040,7 +1040,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1147,7 +1147,7 @@ msgstr "주소록 변환 에러"
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "인터페이스"
 
@@ -1168,7 +1168,7 @@ msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "폴더"
@@ -1244,7 +1244,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "없음"
 
@@ -1257,7 +1257,7 @@ msgid "/_Remove"
 msgstr "/삭제(_R)"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
@@ -1719,12 +1719,12 @@ msgstr "마임 타입"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "메일 발송"
 
@@ -1766,7 +1766,7 @@ msgstr "파일 첨부"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "서명"
 
@@ -1775,8 +1775,8 @@ msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "편집기"
 
@@ -1805,7 +1805,7 @@ msgstr "파일이 없거나 비여있습니다."
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "인코딩"
 
@@ -2035,12 +2035,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2058,7 +2058,7 @@ msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2208,42 +2208,42 @@ msgstr "스풀 디렉토리"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2252,7 +2252,7 @@ msgstr "`%s' 폴더를 생성할 수가 없습니다."
 msgid "/Create _new folder..."
 msgstr "/새 폴더 만들기(_n)..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
@@ -2261,7 +2261,7 @@ msgstr "/폴더 이름 바꾸기(_R)..."
 msgid "/_Move folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/폴더 지우기(_D)"
 
@@ -2270,7 +2270,7 @@ msgstr "/폴더 지우기(_D)"
 msgid "/Empty _trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
@@ -2278,20 +2278,20 @@ msgstr "/새 메시지 확인(_C)"
 msgid "/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/메시지 찾기(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "안 읽은 메시지가 없습니다."
@@ -2304,82 +2304,82 @@ msgstr "/뉴스그룹 구독(_b)..."
 msgid "/_Remove newsgroup"
 msgstr "/뉴스그룹 삭제(_R)"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "전체"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2389,21 +2389,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "`%s' 폴더를 제거할 수가 없습니다."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2412,12 +2417,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2428,21 +2433,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2451,34 +2456,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2603,7 +2608,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "다음"
 
@@ -2624,7 +2629,7 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
@@ -3563,52 +3568,52 @@ msgstr "/도움말(_H)/---"
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3619,16 +3624,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3637,149 +3642,149 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3836,25 +3841,25 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4020,11 +4025,11 @@ msgstr "계정 기본 설정"
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "프라이버시"
 
@@ -4032,7 +4037,7 @@ msgstr "프라이버시"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "고급"
 
@@ -4161,7 +4166,7 @@ msgid "Authentication method"
 msgstr "인증 방법"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "자동"
 
@@ -4205,8 +4210,8 @@ msgstr "Message-ID 생성"
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " 편집..."
 
@@ -4516,260 +4521,260 @@ msgstr "동작 삭제"
 msgid "Do you really want to delete this action?"
 msgstr "정말로 이 동작을 삭제하시겠습니까?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "일반 설정 창을 생성합니다...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "일반 설정"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "보기"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "새 편지를 자동 검사"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 #, fuzzy
 msgid "every"
 msgstr "보이지 않음"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "분"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "시작할 때 새 편지를 검사"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "병합 후에 모든 지역 폴더 갱신"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "명령어"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "spool로부터 합체"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "합체시 필터링"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "보낸 메시지를 '보낸 편지함'에 저장"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "일반"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "서명 분리자"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "지동으로 삽입"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "자동으로 회신할 계정 선택"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "회신할 때 메시지를 인용"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "자동으로 외부 편집기 사용"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "줄 바꿈 at"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "글자"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "인용도 줄 바꿈"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 #, fuzzy
 msgid "Wrap on input"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "임시 보관함에 넣기"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "보통"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "회신 형식"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "인용 부호"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "전달 형식"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " 부호 설명 "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "기본 우편함"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "텍스트"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 #, fuzzy
 msgid "letters"
 msgstr "삭제"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "요약 보기"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "날짜 형식"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "요약에 표시될 항목 설정... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "본문"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4778,11 +4783,11 @@ msgstr ""
 "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
 "인코딩 방식이 사용됩니다."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "메시지에 색을 이용하여 보여주기"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4790,543 +4795,548 @@ msgstr ""
 "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
 "표시 (일본어인 경우에만)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "메시지 보기 위에 헤더 창 표시"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "줄 간격"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "픽셀"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "스크롤"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "반 페이지"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "부드러운 스크롤"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "첨부된 이미지 크기 조정"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "표시될 헤더 설정"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "키 선택"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "폴더 삭제"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "자동으로 서명 확인"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "팝업 창에 서명 확인 결과 보이기"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "비밀번호를 메모리에 임시 보관"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 #, fuzzy
 msgid "Expired after"
 msgstr "나중에 보내기"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "분 "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase를 입력할때 Grab input"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "어떤 메시지 파일도 선택되지 않았습니다."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "새 편지를 받은 후 받은 편지함으로 가기"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
 "단지 표시만 될 것입니다)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "표시 명"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "기타"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "받기 대화상자"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "받기 대화상자 보기"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "항상"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "보이지 않음"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "받기 에러 발생시 에러 상자 보이지 않음"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "끝났을 때 받기 대화상자 닫기"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "더블클릭시에 대상에 주소 추가"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "끝낼때"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "끝냈때 확인"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "끝낼때 지운 편지함 비우기"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "지운 편지함 비울때 확인하기"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "큐에 메시지가 있을 때 경고"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "기본 우편함"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "합체을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "자동 (추천)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit 아스키 (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "유니코드 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "서부 유럽(ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "중부 유럽(ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 #, fuzzy
 msgid "the preferred date for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 #, fuzzy
 msgid "Specifier"
 msgstr "파일 선택"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5350,11 +5360,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5363,7 +5373,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5371,20 +5381,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
@@ -5739,19 +5749,19 @@ msgstr "첨부"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "날짜"
 
@@ -6418,99 +6428,99 @@ msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "번호"
 
@@ -6533,7 +6543,7 @@ msgstr "이 메시지를 받지않을 것입니다\n"
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
@@ -6570,6 +6580,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "임시 보관된 메시지를 보냅니다"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "이 프로그램은"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "끝내기"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "폴더 특성"
diff --git a/po/lt.po b/po/lt.po
index c937d766..92f7684f 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -510,7 +510,7 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Nereikalingo pašto filtras"
 
@@ -969,8 +969,8 @@ msgstr "/Naujas _katalogas"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -989,7 +989,7 @@ msgstr "/_Ištrinti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1000,7 +1000,7 @@ msgstr "Vardas:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1155,7 +1155,7 @@ msgstr "Adresų knygos konvertavimo klaida"
 msgid "Addressbook Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Sąsaja"
 
@@ -1176,7 +1176,7 @@ msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Katalogas"
@@ -1252,7 +1252,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Nieko"
 
@@ -1265,7 +1265,7 @@ msgid "/_Remove"
 msgstr "/_Pašalinti"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
@@ -1695,12 +1695,12 @@ msgstr "MIME tipas"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Siųsti"
 
@@ -1742,7 +1742,7 @@ msgstr "Prisegti bylą"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Parašas"
 
@@ -1751,8 +1751,8 @@ msgid "Insert signature"
 msgstr "Įterpti parašą"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Redaktorius"
 
@@ -1780,7 +1780,7 @@ msgstr "Byla neegzistuoja arba yra tuščia."
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Koduotė"
 
@@ -2005,12 +2005,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2028,7 +2028,7 @@ msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2178,42 +2178,42 @@ msgstr "Pasirinkti katalogą"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Gaunami"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2222,7 +2222,7 @@ msgstr "Negaliu sukurti katalogo „%s“."
 msgid "/Create _new folder..."
 msgstr "/Sukurti _naują katalogą..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalogą..."
 
@@ -2230,7 +2230,7 @@ msgstr "/Pe_rvadinti katalogą..."
 msgid "/_Move folder..."
 msgstr "/Per_kelti katalogą..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Iš_trinti katalogą"
 
@@ -2238,7 +2238,7 @@ msgstr "/Iš_trinti katalogą"
 msgid "/Empty _trash"
 msgstr "/Išvaly_ti šiukšlinę"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti paštą"
 
@@ -2246,20 +2246,20 @@ msgstr "/_Patikrinti paštą"
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalogų medį"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/I_eškoti žinučių"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/_Atsisiųsti"
 
@@ -2271,81 +2271,81 @@ msgstr "/_Prisijungti prie naujienų grupės"
 msgid "/_Remove newsgroup"
 msgstr "/Paša_linti naujienų grupę"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nesk."
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Siunčiamos žinutės („%s“)..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida siunčiant žinutes („%s“)."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,21 +2355,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Negaliu pašalinti katalogo „%s“"
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,12 +2383,12 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ištrinti katalogą"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2396,21 +2401,21 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2424,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2571,7 +2576,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Kitas"
 
@@ -2592,7 +2597,7 @@ msgstr "Baigti"
 msgid "Sylpheed: %d new messages"
 msgstr "Baigta (Naujos žinutės: %d)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Senas „Sylpheed“"
@@ -3514,51 +3519,51 @@ msgstr "/_Pagalba/---"
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3569,16 +3574,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3587,145 +3592,145 @@ 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:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
@@ -3782,25 +3787,25 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Mokymosi komanda"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3964,11 +3969,11 @@ msgstr "Sąskaitos nustatymai"
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privatumas"
 
@@ -3976,7 +3981,7 @@ msgstr "Privatumas"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Papildomi"
 
@@ -4101,7 +4106,7 @@ msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatinis"
 
@@ -4142,8 +4147,8 @@ msgstr "Generuoti „Message-ID“"
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Redaguoti... "
 
@@ -4473,85 +4478,85 @@ msgstr "Ištrinti veiksmą"
 msgid "Do you really want to delete this action?"
 msgstr "Ar tikrai norite ištrinti šį veiksmą?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Sukuriamas bendrų nustatymų langas...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Bendri nustatymai"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Vaizdas"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Nereikalingas paštas"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatiškai tikrinti paštą"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "kas"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minutė(s)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Tikrinti paštą paleidžiant"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Atnaujinti visus vietinius katalogus po prijungimo"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Vykdyti komandą kai gautos naujos žinutės"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Komanda"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "„%d“ bus pakeistas naujų žinučių skaičiumi."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Prijungti iš vietinio kaupo"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtruoti prijungiant"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Kelias iki kaupo"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Išsaugoti išsiųstas žinutes"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Filtruoti išsiųstas žinutes"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Siuntimo kodavimas"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4559,169 +4564,169 @@ msgstr ""
 "Nurodykite siuntimo kodavimą („Content-Transfer-Encoding“) naudojamą jei "
 "laiške yra ne „ASCII“ simbolių."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Bendras"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Parašo skirtukas"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Įterpti automatiškai"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automatiškai pažymėti sąskaitą atsakymams"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Cituoti žinutes atsakant"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Mygtukas „Atsakyti“ atsako pašto konferencijai"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automatiškai paleisti išorinį redaktorių"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Atšaukimo lygis"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Laužyti eilutes kas"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "simboliai"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Laužyti citatas"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Laužyti įvedant"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Laužyti prieš išsiunčiant"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Įprastas"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Atsakymo formatas"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Citavimo simbolis"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Persiuntimo formatas"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Simbolių paaiškinimas "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekstas"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Katalogas"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Rodyti neskaitytų žinučių skaičių šalia katalogo pavadinimo"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Rodyti neskaitytų žinučių skaičių šalia katalogo pavadinimo"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Sutrumpinti naujienų grupes ilgesnes nei"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "raidės"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Santrauka"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Išskleisti gijas"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Datos formatas"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Nustatyti santraukoje rodomus laukus... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Žinutė"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Rodyti/Simbolių ko_duotė"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4729,11 +4734,11 @@ msgstr ""
 "Jei pažymėta „Automatiškai“, bus naudojama optimali koduotė pagal esamą "
 "lokalę."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Spalvinti žinutes"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4741,259 +4746,264 @@ msgstr ""
 "Rodyti kelių baitų abėcėlę kaip ASCII simbolius\n"
 "(tik Japonų)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Rodyti antraščių langelį virš žinutės"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Rodyti sutrumpintas antraštes"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Rodyti HTML žinutes kaip tekstą"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Rodyti kursorių žinutėje"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Tarpas tarp eilučių:"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "taškas(-ai)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Slinkti"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pusė puslapio"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Lygus slinkimas"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Žingsnis"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Paveikslėliai"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Keisti prisegtų paveikslėlių dydį, kad tilptų į langą"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Rodyti paveikslėlius žinutėje"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Įjungti nereikalingo pašto kontrolę"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Mokymosi komanda"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Pasirinkti raktus"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Reikalingas"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Klasifikavimo komanda"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Nereikalingi"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Žinutės, pažymėtos nereikalingomis, bus perkeltos į šį katalogą."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Gaunant filtruoti žinutes klasifikuotas kaip nereikalingas"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Ištrinti iš serverio"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automatiškai tikrinti parašą"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Rodyti parašo tikrinimo rezultatą naujame lange"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Laikinai saugoti slaptą frazę atmintyje"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Galiojimas"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minutė(s)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Nustatymas „0“ saugos slaptą frazę atmintyje visos sesijos metu."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Perimti įvesti, kai įvedama slapta frazė"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Rodyti perspėjimą startuojant, jei GnuPG neveikia"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Visuomet atidaryti santraukoje pasirinktas žinutes"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Atidaryti pirmą neskaitytą žinutę įeinant į katalogą"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Pažymėti žinutę skaityta tik jei ji atidaroma naujame lange"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Eiti į gaunamų laiškų katalogą po pašto gavimo"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Nedelsiant vykdyti žinučių perkėlimą ar trinimą"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Jei išjungta, žinutės bus pažymėtos iki vykdymo"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Išdėstyti mygtukus pagal GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Rodomas vardas"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Klavišų susiejimai... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Kiti"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Vykdyti komandą"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Gavimo langas"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Rodyti gavimo langą"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Visuomet"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Tik kai gaunama rankiniu būdu"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Niekada"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Nerodyti klaidos lango po nesėkmingo gavimo"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Užverti langą baigus gavimą"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Įdėti adresus į paskirties katalogą dukart spragtelėjus"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Išeinant"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Patvirtinti išėjimą"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Išvalyti šiukšlinę išeinant"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Paklausti prieš išvalant"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Perspėti jei yra žinučių eilėje"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Išorinė komanda (%s bus pakeista bylos vardu / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Naršyklė"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Naudoti išorinę programą sujungimui"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Naudoti išorinę programą siuntimui"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Įjungti griežtą santraukos laikinosios atminties vientisumo tikrinimą"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5002,264 +5012,264 @@ msgstr ""
 "Įjunkite, jei katalogų turinys gali būti modifikuotas kitų programų.\n"
 "Šis pasirinkimas sumažins santraukos rodymo greitį."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Prisijungimo skirtasis laikas"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekundė(s)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatiškai (Rekomenduojama)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unikodas (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Vakarų Europos (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Vakarų Europos (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Vakarų Europos (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Centrinės Europos (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Graikų (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajų (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajų (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkų (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonų (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonų (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonų (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Supaprastinta Kinų (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Supaprastinta Kinų (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicinė Kinų (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicinė Kinų (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinų (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korėjiečių (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tailandiečių (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tailandiečių (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "sutrumpinta savaitės diena"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "pilna savaitės diena"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "sutrumpintas mėnuo"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "pilnas mėnuo"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "pageidaujama data ir laikas esamai lokalei"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "amžius (metai/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "mėnesio diena"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "valanda (24)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "valanda (12)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "metų diena"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "mėnesio numeris"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minutės"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM / PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekundės"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "savaitės dienos numeris"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "pageidaujama data esamai lokalei"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "paskutiniai du metų skaitmenys"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "metai"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "laiko zona"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Simbolis"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Aprašymas"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Pavyzdys"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Nustatyti žinutės spalvas"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Cituojams tekstas - Pirmas lygis"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Cituojams tekstas - Antras lygis"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Cituojams tekstas - Trečias lygis"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Nuoroda"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Atkurti citatos spalvas"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Pasirinkite spalvą pirmam citatos lygiui"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Pasirinkite spalvą antram citatos lygiui"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Pasirinkite spalvą trečiam citatos lygiui"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Pasirinkite nuorodos spalvą"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Simbolių apibūdinimas"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5283,11 +5293,11 @@ msgstr ""
 "Naujienų grupė\n"
 "Žinutės-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Jei egzistuoja „x“, rodo „expr“"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5301,7 +5311,7 @@ msgstr ""
 "Cituojamas tekstas be parašo\n"
 "Simbolis %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5313,20 +5323,20 @@ msgstr ""
 "Atidarantys riestiniai skliaustai\n"
 "Uždarantys riestiniai skliaustai"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Klavišų susiejimai"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Klavišų susiejimai... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Įprastas"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Senas „Sylpheed“"
 
@@ -5655,19 +5665,19 @@ msgstr "Priedas"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6343,97 +6353,97 @@ msgstr "\tNustatoma santrauka iš žinutės duomenų..."
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš žinutės duomenų..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Žinutė %d pažymėta\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Žinutė %d pažymėta skaityta\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Žinutė %d pažymėta neskaityta\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Žinutė %s/%d pažymėta trinimui\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Ištrinti žinutę(-es)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti žinutes iš šiukšlinės?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Trinamos identiškos žinutės..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Žinutė %s/%d atžymėta\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Žinutė %d pažymėta perkėlimui į %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Žinutė %d pažymėta kopijavimui į %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su žinutėmis."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota žinučių: %d"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr."
 
@@ -6454,7 +6464,7 @@ msgstr "Žinutė negali būti parodyta.\n"
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
@@ -6491,6 +6501,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Ži_nutė/_Gauti/Gauti iš _esamos sąskaitos"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Siųsti laiškus eilėje"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Apie"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Išeiti"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Katalogo savybės"
diff --git a/po/nl.po b/po/nl.po
index c397af05..a8e3ec1e 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -517,7 +517,7 @@ msgstr "%s gevonden\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Accounts"
@@ -981,8 +981,8 @@ msgstr "/Nieuwe _map"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -1001,7 +1001,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1012,7 +1012,7 @@ msgstr "Naam:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1061,7 +1061,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1173,7 +1173,7 @@ msgstr "Adresboek omzetprobleem"
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interface"
 
@@ -1194,7 +1194,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Accounts"
@@ -1270,7 +1270,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Geen"
 
@@ -1283,7 +1283,7 @@ msgid "/_Remove"
 msgstr "/_Verwijderen"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -1745,12 +1745,12 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Verzenden"
 
@@ -1792,7 +1792,7 @@ msgstr "Bestand bijvoegen"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Tekenen"
 
@@ -1801,8 +1801,8 @@ msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1830,7 +1830,7 @@ msgstr "Bestand bestaat niet of is leeg."
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codering"
 
@@ -2061,12 +2061,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2084,7 +2084,7 @@ msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr "Bladeren..."
 
@@ -2235,42 +2235,42 @@ msgstr "Map voor de lokale mail"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2279,7 +2279,7 @@ msgstr "Kan map '%s' niet aanmaken."
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
@@ -2288,7 +2288,7 @@ msgstr "/Map _hernoemen"
 msgid "/_Move folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
@@ -2297,7 +2297,7 @@ msgstr "/Map ver_wijderen"
 msgid "/Empty _trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
@@ -2305,20 +2305,20 @@ msgstr "/Nieuwe e-mail _ophalen"
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Geen ongelezen berichten."
@@ -2331,82 +2331,82 @@ msgstr "/A_bonneren op een nieuwsgroep..."
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2416,21 +2416,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Kan map '%s' niet verwijderen."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2439,12 +2444,12 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2455,21 +2460,21 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2478,34 +2483,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2631,7 +2636,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Volgende"
 
@@ -2652,7 +2657,7 @@ msgstr "Afronden"
 msgid "Sylpheed: %d new messages"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Oude Sylpheed"
@@ -3593,52 +3598,52 @@ msgstr "/_Hulp/---"
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3649,16 +3654,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3668,149 +3673,149 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3867,25 +3872,25 @@ msgstr "Bijvoegingen"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Uitvoeren"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4050,11 +4055,11 @@ msgstr "Accountvoorkeuren"
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4062,7 +4067,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -4189,7 +4194,7 @@ msgid "Authentication method"
 msgstr "Identificatiemethode"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4233,8 +4238,8 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4564,88 +4569,88 @@ msgstr "Actie verwijderen"
 msgid "Do you really want to delete this action?"
 msgstr "Wilt u werkelijk deze actie verwijderen?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Venster algemene voorkeuren wordt aangemaakt...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Beeld"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Accounts"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Kijk "
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "iedere"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuten of er nieuwe e-mail is."
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Kijk bij opstarten of er nieuwe e-mail is"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Ververs alle lokale mappen na de verwerking"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Lokale e-mail beheren"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filteren bij het ophalen"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Verzonden berichten opslaan in de outbox"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Berichtcodering"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4654,170 +4659,170 @@ msgstr ""
 "Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
 "het bericht te coderen wanneer deze non-ASCII tekens bevat."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Algemeen"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Automatisch invoegen"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Account automatisch selecteren voor beantwoorden"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Originele bericht citeren bij beantwoorden"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "niveau van ongedaan maken"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Regelterugloop na:"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "tekens"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Regelterugloop gebruiken bij citeren"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Regelterugloop tijdens invoer"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Regelterugloop activeren bij het verzenden"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Opslaan als klad"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normaal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Antwoordopmaak"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Citeerteken"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Doorstuuropmaak"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Standaard inbox"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Accounts"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "brieven"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Bericht"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/B_eeld/_Sorteren/Aflopend"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4826,11 +4831,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest\n"
 "optimale codering voor de huidige locale gebruikt."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4838,545 +4843,550 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Headerweergave instellingen"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Accounts"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Uitvoeren"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Selecteer keys"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Uitvoeren"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Accounts"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Verwijder map"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Instellen op '0' zal het wachtwoord tot het\n"
 " einde bam de sessie opslaan)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Geen berichtsbestand geselecteerd."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
 "venster"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Berichten worden gemarkeerd voor deze acties\n"
 "wanneer dit uitgeschakeld is)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Naam in de lijst"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Diversen"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Uitvoeren"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standaard inbox"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Extern programma gebruiken voor verwerking van de e-mail"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (aanbevolen)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5400,11 +5410,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5418,7 +5428,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5430,20 +5440,20 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
@@ -5801,19 +5811,19 @@ msgstr "Bijvoeging"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6484,100 +6494,100 @@ msgstr "\t"
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr."
 
@@ -6600,7 +6610,7 @@ msgstr "een bericht wordt niet ontvangen\n"
 msgid "Sa_ve this image as..."
 msgstr "/Opslaan als..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
@@ -6637,6 +6647,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Be_richt/_Alle e-mail ophalen"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Be_richt/_Alle e-mail ophalen"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Verzend berichten uit de wachtrij"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Info"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Afsluiten"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Mapeigenschappen"
diff --git a/po/pl.po b/po/pl.po
index d8a6c296..efcd5ff8 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -503,7 +503,7 @@ msgstr "Znaleziono: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Niechciana poczta"
@@ -966,8 +966,8 @@ msgstr "/Nowy _katalog"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -986,7 +986,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -997,7 +997,7 @@ msgstr "Nazwa:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1046,7 +1046,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1160,7 +1160,7 @@ msgstr "Błąd konwersji książki adresowej"
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interfejs"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Katalog"
@@ -1257,7 +1257,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Brak"
 
@@ -1270,7 +1270,7 @@ msgid "/_Remove"
 msgstr "/_Usuń"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
@@ -1698,12 +1698,12 @@ msgstr "typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Wyślij"
 
@@ -1745,7 +1745,7 @@ msgstr "Dołącz plik"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1754,8 +1754,8 @@ msgid "Insert signature"
 msgstr "Wstaw podpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Edytor"
 
@@ -1783,7 +1783,7 @@ msgstr "Brak pliku lub pusty plik."
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodowanie"
 
@@ -2012,12 +2012,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2035,7 +2035,7 @@ msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2185,42 +2185,42 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2229,7 +2229,7 @@ msgstr "Nie można utworzyć katalog '%s'."
 msgid "/Create _new folder..."
 msgstr "/Utwórz _nowy katalog..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
@@ -2238,7 +2238,7 @@ msgstr "/_Zmień nazwę katalogu..."
 msgid "/_Move folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Usuń katalog"
 
@@ -2246,7 +2246,7 @@ msgstr "/_Usuń katalog"
 msgid "/Empty _trash"
 msgstr "/Opróżnij śmie_tnik"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Sprawdź nowe wiadomoś_ci"
 
@@ -2254,20 +2254,20 @@ msgstr "/Sprawdź nowe wiadomoś_ci"
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalogów"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomości..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Pobierz"
 
@@ -2279,81 +2279,81 @@ msgstr "/_Subskrybuj grupę news..."
 msgid "/_Remove newsgroup"
 msgstr "/Usuń g_rupę news"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2363,21 +2363,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Nie można usunąć katalogu \"%s\"."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2386,12 +2391,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2402,21 +2407,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2430,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2577,7 +2582,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Następna"
 
@@ -2598,7 +2603,7 @@ msgstr "Koniec"
 msgid "Sylpheed: %d new messages"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
@@ -3515,51 +3520,51 @@ msgstr "/_Pomoc/---"
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3570,16 +3575,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3589,146 +3594,146 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3785,25 +3790,25 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3967,11 +3972,11 @@ msgstr "Preferencje konta"
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Prywatność"
 
@@ -3979,7 +3984,7 @@ msgstr "Prywatność"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Zaawansowane"
 
@@ -4105,7 +4110,7 @@ msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -4150,8 +4155,8 @@ msgstr "Generowanie identyrikatora wiadomości"
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4482,255 +4487,255 @@ msgstr "Usuń polecenie"
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdę usunąć to polecenie?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Tworzenie okna preferencji...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferencje"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Wyświetlanie"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Niechciana poczta"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automatyczne sprawdzanie poczty"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "każde"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuta(y)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu programu"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Odbierz z kolejki"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrowanie przy odbieraniu"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Ścieżka do kolejki"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Kodowanie przesyłanych danych"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "Wybierz kodowanie dla listów, których treść zawiera znaki nie-ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Ogólne"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Automatyczne wstawianie podpisu"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automatyczne ustawianie konta dla odpowiedzi"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Cytowanie wiadomości przy odpowiedzi"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automatyczne uruchamianie zewnętrznego edytora"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Poziom Cofnij"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomości przy"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znakach"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Zawijanie cytatu"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Zawijanie podczas wprowadzania"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Zawijanie przed wysłaniem"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Zwykłe"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Format przekazywania"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Opis symboli "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Domyślny inbox"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Katalog"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup dłuższych niż "
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "liter"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Widok listy wiadomości"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Ustaw element wyświetlania podsumowania... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4738,542 +4743,547 @@ msgstr ""
 "Jeśli wybrano `Automatyczne', zostanie użyte kodowanie optymalne dla "
 "bieżących ustawień lokalnych."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Włączenie kolorowania wiadomości"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Wyświetlanie wiadomości HTML jako teskt"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Pokaż kursor w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Odstęp międzywierszowy"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Wygładzone przewijanie"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasuj rozmiar załączonych obrazków do rozmiaru okna"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Pokaż grafikę w treści"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Niechciana poczta"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Wybierz klucze"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "katalog:"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Usuń z serwera"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpisów"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Wygasa po"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Wartość '0' ustawi zapamiętywanie hasła na czas całej sesji."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Gdy opcja ta jest wyłączona, wiadomości pozostaną zaznaczone do aż do "
 "momentu wykonania."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Wyświetlana nazwa"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Inne"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Wykonaj polecenie"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Wyświetlanie okna dialogowego odbierania"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Podczas wyjścia"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Opróżnianie śmietnika przy zamykaniu programu"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Wyświetlanie pytania przed opróżnieniem"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Domyślny inbox"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Użycie zewnętrznego programu do odbierania poczty"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatyczne (Zalecane)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitowe ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Śodkowa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtyckie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Greckie (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajskie (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajskie (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tureckie (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japońskie (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japońskie (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japońskie (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczone Chińskie (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Uproszczone Chińskie (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjne Chińskie (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjne Chińskie (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chińskie (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Koreańskie (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tajskie (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tajskie (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5297,11 +5307,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5315,7 +5325,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5327,20 +5337,20 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
@@ -5672,19 +5682,19 @@ msgstr "Załącznik"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6374,97 +6384,97 @@ msgstr "\tUstawianie podsumowania z danych wiadomości..."
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr"
 
@@ -6485,7 +6495,7 @@ msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
@@ -6522,6 +6532,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Wyślij wiadomości z kolejki"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O programie"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Koniec programu"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Właściwości katalogu"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 78fb1018..c45fcd5f 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2006-01-05 09:40-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -512,7 +512,7 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
@@ -970,8 +970,8 @@ msgstr "/Nova _Pasta"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -990,7 +990,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1001,7 +1001,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1049,7 +1049,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1161,7 +1161,7 @@ msgstr "Erro na conversão do catálogo de endereços"
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interface"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Pasta"
@@ -1258,7 +1258,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1271,7 +1271,7 @@ msgid "/_Remove"
 msgstr "/_Remover"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
@@ -1700,12 +1700,12 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Enviar"
 
@@ -1747,7 +1747,7 @@ msgstr "Anexar arquivo"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Assinatura"
 
@@ -1756,8 +1756,8 @@ msgid "Insert signature"
 msgstr "Inserir assinatura"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1785,7 +1785,7 @@ msgstr "O arquivo não existe ou está vazio."
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codificação"
 
@@ -2010,12 +2010,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2033,7 +2033,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2184,42 +2184,42 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2228,7 +2228,7 @@ msgstr "não foi possível criar a pasta `%s'."
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
@@ -2236,7 +2236,7 @@ msgstr "/_Renomear pasta..."
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
@@ -2244,7 +2244,7 @@ msgstr "/_Apagar pasta"
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
@@ -2252,19 +2252,19 @@ msgstr "/_Buscar novas mensagens"
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 msgid "/_Update summary"
 msgstr "/A_tualizar sumário"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/_Baixar"
 
@@ -2276,81 +2276,81 @@ msgstr "/_Assinar grupo de notícias..."
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de notícias"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2360,21 +2360,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Não foi possível excluir a pasta `%s'."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2384,11 +2389,11 @@ msgstr ""
 "As mensagens reais não serão apagadas.\n"
 "Deseja apagar a pasta?"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2401,20 +2406,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2423,34 +2428,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2576,7 +2581,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Próxima"
 
@@ -2597,7 +2602,7 @@ msgstr "Terminar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3517,50 +3522,50 @@ msgstr "/_Ajuda/---"
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3570,16 +3575,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3589,145 +3594,145 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3784,24 +3789,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3967,11 +3972,11 @@ msgstr "Preferências da Conta"
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -3979,7 +3984,7 @@ msgstr "Privacidade"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avançadas"
 
@@ -4103,7 +4108,7 @@ msgid "Authentication method"
 msgstr "Método de Autenticação"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automático"
 
@@ -4143,8 +4148,8 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4473,86 +4478,86 @@ msgstr "Apagar ação"
 msgid "Do you really want to delete this action?"
 msgstr "Você realmente deseja apagar esta ação?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Criando janela de preferências comuns...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferências comuns"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Exibir"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Spam"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Checar nova mensagem"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "a cada"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Checar o correio quando iniciar"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Atualizar todas as pastas locais ao incorporar"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Executar comando quando chegarem novas mensagens"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' será substituído pelo número de novas mensagens."
 
 # alguma tradução boa para spool?
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Incorporar do spool local"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrar ao incorporar"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Caminho para o spool"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Salvar mensagens enviadas na Caixa de saída"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Aplicar regras de filtragem para as mensagens enviadas"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Codificação para transferência"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4560,162 +4565,162 @@ msgstr ""
 "Especifique a codificação de caracteres a ser usada quando a mensagem "
 "contiver caracteres não ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Geral"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Inserir automaticamente"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Escolher conta para respostas automaticamente"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Quotar mensagem ao responder"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Botão de responder chama resposta para a lista"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Executar o editor externo automaticamente"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Nível de desfazer"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Quebrar mensagens em"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Quebrar quote"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Quebrar na entrada"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 msgid "Auto-save to draft"
 msgstr "Salvar automaticamente como rascunho"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 msgid "Format"
 msgstr "Formato"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr "Corretor ortográfico"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formato de Mensagem Encaminhada"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Descrição dos símbolos "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr "Habilitar Corretor ortográfico"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 msgid "Default language:"
 msgstr "Idioma padrão:"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 msgid "Text font"
 msgstr "Fonte do texto"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Visualização de Pastas"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Exibir número de não lidas próximas ao nome da pasta"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Exibir colunas com o número de mensagens na visualização de pastas"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Visão de Sumário "
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Elementos visíveis no cabeçalho... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 msgid "Default character encoding"
 msgstr "Codificação padrão de caracteres"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Isto é usado ao exibir mensagens que não indicam a codificação de caracteres."
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 msgid "Outgoing character encoding"
 msgstr "Codificação de caracteres para envio"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4723,11 +4728,11 @@ msgstr ""
 "Se `Automático' for selecionado, a melhor codificação para o locale atual "
 "será usada."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4735,79 +4740,79 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e numéricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Exibir cabeçalho acima da visão da mensagem"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Cabeçalhos pequenos na visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Renderizar mensagens HTML como texto"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Exibir cursor na área de visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Imagens"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo para que caibam na janela"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Dispor as imagens em seqüência"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Habilitar controle de spam"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Comando de aprendizado:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 msgid "(Select preset)"
 msgstr "(Selecionar pré-definido)"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Não spam"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Comando de classificação"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -4815,178 +4820,183 @@ msgstr ""
 "Para classificar SPAM automaticamente, deve-se treinar manualmente o "
 "classificador com uma quantidade razoável de SPAM e não-SPAM."
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Pasta de spam"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "As mensagens classificadas como spam serão movidas para esta pasta."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensagens classificadas como spam ao receber"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 msgid "Delete junk mails from server on receiving"
 msgstr "Apagar SPAMs do servidor ao receber"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr "Marcar SPAM filtrado como lido"
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na memória"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Definindo para '0' guardará a senha para toda a sessão."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Sempre abrir mensagens no sumário quando selecionado"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Mensagens permanecerão marcadas até a execução se isto estiver desativado."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordenar os botões de acordo com o GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Exibir Nome"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Outros"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 msgid "External commands"
 msgstr "Comandos externos"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Exibir diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Apenas no recebimento manual"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Fechar diálogo de recepção quando terminar"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endereço para o destino quando clicado duas vezes"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Navegador padrão)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Usar um programa externo para obter mensagens"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -4997,263 +5007,263 @@ msgstr ""
 "Esta opção reduzirá o desempenho de exibição do sumário."
 
 # tradução boa para socket?
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Tempo limite de E/S no socket:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 msgid "Western European (Windows-1252)"
 msgstr "Europeu Ocidental (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinês simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 24 horas"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 12 horas"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5278,11 +5288,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5296,7 +5306,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5308,19 +5318,19 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "Selecione o conjunto pré-definido de mapeamento de teclas."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -5646,19 +5656,19 @@ msgstr "Anexo"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6324,97 +6334,97 @@ msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Não."
 
@@ -6435,7 +6445,7 @@ msgstr "Esta mensagem não pode ser exibida.\n"
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
@@ -6472,6 +6482,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Mensagem/_Receber/Receber da conta _atual"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Enviar Mensagem(s) da fila"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Sobre"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Sair"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Propriedades da pasta"
diff --git a/po/ro.po b/po/ro.po
index ac197733..50b79840 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -518,7 +518,7 @@ msgstr "Găsit: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuraţia a fost salvată.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Director"
@@ -988,8 +988,8 @@ msgstr "/_Director nou"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -1008,7 +1008,7 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1019,7 +1019,7 @@ msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1068,7 +1068,7 @@ msgstr ""
 "adreselor conţinute de el ? Dacă ştergeţi doar directorul, adresele\n"
 "vor fi mutate in directorul părinte."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Ştergere director"
 
@@ -1182,7 +1182,7 @@ msgstr "Eroare de convertire a agendei"
 msgid "Addressbook Conversion"
 msgstr "Convertire agendă"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Interfaţă"
 
@@ -1203,7 +1203,7 @@ msgid "Group"
 msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Director"
@@ -1279,7 +1279,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Niciunul"
 
@@ -1292,7 +1292,7 @@ msgid "/_Remove"
 msgstr "/Ş_tergere"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
@@ -1760,12 +1760,12 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Trimitere"
 
@@ -1807,7 +1807,7 @@ msgstr "Ataşare fişier"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Semnătură"
 
@@ -1816,8 +1816,8 @@ msgid "Insert signature"
 msgstr "Inserare semnătură"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1846,7 +1846,7 @@ msgstr "Fişierul nu există sau este gol."
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Codare"
 
@@ -2077,12 +2077,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -2100,7 +2100,7 @@ msgstr "Editare Înregistrare JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2252,45 +2252,45 @@ msgstr "Director spool"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
@@ -2300,7 +2300,7 @@ msgstr "Directorul `%s' nu a putut fi creat."
 msgid "/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 #, fuzzy
 msgid "/_Rename folder..."
 msgstr "/_Redenumire director"
@@ -2310,7 +2310,7 @@ msgstr "/_Redenumire director"
 msgid "/_Move folder..."
 msgstr "/Căutare _director..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Ştergere _director"
 
@@ -2319,7 +2319,7 @@ msgstr "/Ştergere _director"
 msgid "/Empty _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
@@ -2328,21 +2328,21 @@ msgstr "/Verificare _mesaje noi"
 msgid "/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tCăutare mesaje nestocate... "
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nu există mesaje necitite"
@@ -2356,85 +2356,85 @@ msgstr "/În_scriere la newsgroup"
 msgid "/_Remove newsgroup"
 msgstr "/Şte_rgere newsgroup"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Creare mod vedere director...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Setare informaţii despre director...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2444,21 +2444,26 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Directorul `%s' nu a putut fi creat."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2467,12 +2472,12 @@ 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:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ştergere director"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2483,21 +2488,21 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2506,35 +2511,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:2440
+#: src/folderview.c:2459
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -2659,7 +2664,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Înainte"
 
@@ -2680,7 +2685,7 @@ msgstr "Terminare"
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d mesaje noui\n"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr ""
 
@@ -3709,52 +3714,52 @@ msgstr "/_Ajutor/---"
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3765,16 +3770,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3784,151 +3789,151 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr ""
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -3990,25 +3995,25 @@ msgstr "Ataşamente"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executare"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4171,11 +4176,11 @@ msgstr "Preferinţe comune"
 msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferinţe cont...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Recepţionare"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr ""
 
@@ -4183,7 +4188,7 @@ msgstr ""
 msgid "SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avansat"
 
@@ -4317,7 +4322,7 @@ msgid "Authentication method"
 msgstr "Autentificare..."
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4361,8 +4366,8 @@ msgstr "Generare Message-ID"
 msgid "Add user-defined header"
 msgstr "Adăugare de câmpuri definite de utilizator"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Editare..."
 
@@ -4696,836 +4701,841 @@ msgstr "Ştergere cont"
 msgid "Do you really want to delete this action?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Creare fereastră de preferinţe comune...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Preferinţe comune"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Afişare"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Director"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Verificare automată a poştei"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 #, fuzzy
 msgid "every"
 msgstr "Server"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Verificare poştă la pornire"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 #, fuzzy
 msgid "Update all local folders after incorporation"
 msgstr "Foloseşte un program extern pentru incorporare"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr ""
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Commandă"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Recepţionarea numărului de mesaje noi"
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Incorporare din spool"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrare la incorporare"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 #, fuzzy
 msgid "Save sent messages to outbox"
 msgstr "Salvare mesaje trimise în outbox"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr ""
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Separator de semnătură"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 #, fuzzy
 msgid "Insert automatically"
 msgstr "Inserează semnătura automat"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 #, fuzzy
 msgid "Automatically select account for replies"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citează mesajul la care se răspunde"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Răspunde _la toţi"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 #, fuzzy
 msgid "Automatically launch the external editor"
 msgstr "Editare cu editor extern"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "caractere"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Taie liniile semnăturii"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Salvare"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Mod Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 #, fuzzy
 msgid "Spell checking"
 msgstr "Verificare tot"
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 #, fuzzy
 msgid "Reply format"
 msgstr "Răspunde la toţi"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Semn de citare"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 #, fuzzy
 msgid "Forward format"
 msgstr "Înaintare"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Descrierea simbolurilor "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 #, fuzzy
 msgid "Enable Spell checking"
 msgstr "Verificare tot"
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Ştergere"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Înainte"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Director"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Afişare număr de mesaje necitite lângă numele directorului"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Afişare număr de mesaje necitite lângă numele directorului"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 #, fuzzy
 msgid "letters"
 msgstr "Ştergere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 #, fuzzy
 msgid "Summary View"
 msgstr "/Re_zumat"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Destinatarul pe coloana 'From', daca sunteţi expeditorul"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 #, fuzzy
 msgid "Expand threads"
 msgstr "/_Afişare antet"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 #, fuzzy
 msgid "Date format"
 msgstr "Format de citare:"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Elemente afişate... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Mesaj"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Vedere/_La"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Vedere/_La"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Colorare mesaje"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Afişare caractere pe 2 biţi cu un alfabet pe 1 bit"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 #, fuzzy
 msgid "Display header pane above message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Spaţiere linii"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "/Afişare ca te_xt"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Director"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Executare"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Selectare fişier"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Executare"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Director"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrare mesaje la primire"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Ştergere director"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 #, fuzzy
 msgid "Automatically check signatures"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 #, fuzzy
 msgid "Show signature check result in a popup window"
 msgstr "Separator de semnătură"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 #, fuzzy
 msgid "Expired after"
 msgstr "Mai târziu"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 #, fuzzy
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "un mesaj nu a putut fi recepţionat\n"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Mesaj/Desc_hidere în fereastră nouă"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Nume Afişat"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Altele"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Executare"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Recepţionare"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 #, fuzzy
 msgid "Show receive dialog"
 msgstr "Recepţionare"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 #, fuzzy
 msgid "Always"
 msgstr "Alias"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "La ieşire"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Confirmare ieşire"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 #, fuzzy
 msgid "Empty trash on exit"
 msgstr "Curăţare gunoi"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 #, fuzzy
 msgid "Ask before emptying"
 msgstr "Întreabă înainte de curăţare"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 #, fuzzy
 msgid "Warn if there are queued messages"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Editor extern (%s va fi înlocuit de numele fişierului)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Ştergere"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Foloseşte un program extern pentru incorporare"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Folosire program extern pentru trimitere"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Scriere cache rezumat (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Chirilic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcesc (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Chirilic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Chirilic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Chirilic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Chirilic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonez (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonez (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonez (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinezesc Simplificat (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinezesc Simplificat (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinezesc Tradiţional (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinezesc Tradiţional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinezesc"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Corean"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 #, fuzzy
 msgid "Specifier"
 msgstr "Selectare fişier"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 #, fuzzy
 msgid "Description"
 msgstr "Destinaţie"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 #, fuzzy
 msgid "Set message colors"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 #, fuzzy
 msgid "Colors"
 msgstr "Închidere"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5549,11 +5559,11 @@ msgstr ""
 "Message-ID\n"
 "Semnul %"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5562,7 +5572,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5570,21 +5580,21 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 #, fuzzy
 msgid "Key bindings"
 msgstr "Trimitere"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr ""
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 #, fuzzy
 msgid "Default"
 msgstr "Ştergere"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5955,19 +5965,19 @@ msgstr "Ataşamente"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "De la"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Data"
 
@@ -6710,101 +6720,101 @@ msgstr "\tDefinire rezumat din datele din mesaj..."
 msgid "Setting summary from message data..."
 msgstr "Definire rezumat din datele din mesaj..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache rezumat (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "mesajul %d a fost deja stocat.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nu."
 
@@ -6827,7 +6837,7 @@ msgstr "un mesaj nu a putut fi recepţionat\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Salvare ca..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Creare mesaj nou"
@@ -6863,6 +6873,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Despre"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Ieşire"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Proprietate"
diff --git a/po/ru.po b/po/ru.po
index a9c3f7af..98721d5e 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -507,7 +507,7 @@ msgstr "Найдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "папку:"
@@ -970,8 +970,8 @@ msgstr "/Новая папка"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -990,7 +990,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1001,7 +1001,7 @@ msgstr "Имя:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1049,7 +1049,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1162,7 +1162,7 @@ msgstr "Ошибка преобразования адресной книги"
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Папка"
@@ -1259,7 +1259,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Нет"
 
@@ -1272,7 +1272,7 @@ msgid "/_Remove"
 msgstr "/Удалить"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
@@ -1726,12 +1726,12 @@ msgstr "Тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Отправить"
 
@@ -1773,7 +1773,7 @@ msgstr "Вложить файл"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Подпись"
 
@@ -1782,8 +1782,8 @@ msgid "Insert signature"
 msgstr "Добавить подпись"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1811,7 +1811,7 @@ msgstr "Файл не существует или пуст."
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Кодировка"
 
@@ -2041,12 +2041,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2064,7 +2064,7 @@ msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2215,42 +2215,42 @@ msgstr "Выбор папки"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
@@ -2259,7 +2259,7 @@ msgstr "Не удалось создать папку '%s'."
 msgid "/Create _new folder..."
 msgstr "/Создать новую папку..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Переименовать папку..."
 
@@ -2268,7 +2268,7 @@ msgstr "/Переименовать папку..."
 msgid "/_Move folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Удалить папку"
 
@@ -2276,7 +2276,7 @@ msgstr "/Удалить папку"
 msgid "/Empty _trash"
 msgstr "/Очистить корзину"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Проверить новые сообщения"
 
@@ -2284,20 +2284,20 @@ msgstr "/Проверить новые сообщения"
 msgid "/R_ebuild folder tree"
 msgstr "/Перестроить дерево папок"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Поиск сообщений..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Загрузить"
 
@@ -2309,81 +2309,81 @@ msgstr "/Подписка на группу новостей..."
 msgid "/_Remove newsgroup"
 msgstr "/Удалить группу новостей"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитанные"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2393,21 +2393,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Ошибка при удалении папки '%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2416,12 +2421,12 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Удалить папку"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2432,21 +2437,21 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2455,34 +2460,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -2607,7 +2612,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Далее"
 
@@ -2628,7 +2633,7 @@ msgstr "Завершение"
 msgid "Sylpheed: %d new messages"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Старая Sylpheed"
@@ -3554,51 +3559,51 @@ msgstr "/Справка/---"
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3609,16 +3614,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3628,147 +3633,147 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3825,25 +3830,25 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Выполнить команду"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4010,11 +4015,11 @@ msgstr "Настройки учетной записи"
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учетной записи...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Прием"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Защита"
 
@@ -4022,7 +4027,7 @@ msgstr "Защита"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Дополнительные"
 
@@ -4148,7 +4153,7 @@ msgid "Authentication method"
 msgstr "Метод аутентификации"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -4193,8 +4198,8 @@ msgstr "Создавать Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Определить... "
 
@@ -4525,88 +4530,88 @@ msgstr "Удалить действие"
 msgid "Do you really want to delete this action?"
 msgstr "Вы действительно хотите удалить это действие?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Создание окна общих настроек...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Общие настройки"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Отображение"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "папку:"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Проверять приход новых сообщений"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "каждые"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "минут"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Проверять приход новых сообщений при запуске"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Обновить все локальные папки после приема"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Принимать из спула"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Фильтровать при приеме"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Путь к спулу"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Кодирование текста сообщений"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4615,169 +4620,169 @@ msgstr ""
 "Укажите метод кодирования текстов сообщений, содержащих символы\n"
 "не из диапазона ASCII (Content-Transfer-Encoding)."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Общие"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Разделитель подписи"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Добавлять автоматически"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Автоматически выбирать учетную запись при ответе"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Цитировать при ответе"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Автоматически запускать внешний редактор"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Число уровней отката"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Переносить строки с"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "символа"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Переносить цитаты"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Переносить при вводе"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Переносить перед отправкой"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Сохранить в папке черновиков"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Обычный"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Формат ответа"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Знак цитаты"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Формат пересылаемого сообщения"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Описание символов "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Папка для входящих сообщений"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Текст"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Сокращать названия групп новостей длиннее"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "букв"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Список сообщений"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показывать получателя в колонке 'От', если отправитель - Вы"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "Установить показываемые поля..."
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4786,11 +4791,11 @@ msgstr ""
 "При выборе варианта 'Автоматически' будет использована\n"
 "оптимальная кодировка для текущего языка и страны."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Разрешить раскраску сообщений"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4798,541 +4803,546 @@ msgstr ""
 "Отображать многобайтовые алфавитно-цифровые символы\n"
 "как ASCII (только для японских кодировок)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовков над областью просмотра сообщений"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Показывать сокращенные заголовки при просмотре сообщений"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Показывать сокращенные заголовки при просмотре сообщений"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "пикселей"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабировать присоединенные изображения по размеру окна"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка отображения заголовков"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "папку:"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Выполнить команду"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Выбор ключа"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Выполнить команду"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "папку:"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Неотфильтрованные сообщения будут сохранены в этой папке)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фильтровать сообщения при приеме"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Удалить с сервера"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Автоматически проверять подписи"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Показывать результат проверки подписи в отдельном окне"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Сохранять парольную фразу в памяти"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Удалять через"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "минут"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(При установке в 0 парольная фраза будет храниться\n"
 " в течение всего сеанса)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Захватить ввод при запросе пароля"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приема новых сообщений"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Сообщения будут просто помечены до выполнения, если\n"
 " эта опция не включена)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Отображаемое имя"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Другое"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Выполнить команду"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Окно приема сообщений"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Показывать окно приема сообщений"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Всегда"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Только при ручном запуске приема"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Никогда"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Не отображать сообщение об ошибке при получении сообщений"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Закрывать окно приема сообщений после завершения"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Добавлять адрес в список адресатов по двойному щелчку"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Подтверждение при выходе"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Очищать корзину при выходе"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Спрашивать перед очисткой"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии сообщений в очереди"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Внешние команды (%s будет заменен на имя файла/URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Папка для входящих сообщений"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Использовать внешнюю программу для приема"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Использовать внешнюю программу для отправки"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Запись кеша списка (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Время ожидания ответа из сети:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Автоматически (Рекомендуется)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 бит ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропейская (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Центральноевропейская (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийская (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийская (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кириллица Win (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Русская (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Украинская (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кириллица Win (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционная китайская (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционная китайская (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "сокращенное название дня недели"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "сокращенное название месяца"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5356,11 +5366,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5374,7 +5384,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ '%'"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5386,20 +5396,20 @@ msgstr ""
 "Символ '{'\n"
 "Символ '}'"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Старая Sylpheed"
 
@@ -5729,19 +5739,19 @@ msgstr "Вложение"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Дата"
 
@@ -6418,97 +6428,97 @@ msgstr "\tФормирование списка сообщений..."
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удаленное\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Уничтожение повторяющихся сообщений..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Номер"
 
@@ -6530,7 +6540,7 @@ msgstr "Невозможно отобразить сообщение.\n"
 msgid "Sa_ve this image as..."
 msgstr "/Сохранить как..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
@@ -6570,6 +6580,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Сообщение/Получить/Получить с текущей учетной записи"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Сообщение/Получить/Получить со всех учетных записей"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Послать сообщения из очереди"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "О программе"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Выход"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Свойства папки"
diff --git a/po/sk.po b/po/sk.po
index 56a8e4ab..25f3da2b 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -507,7 +507,7 @@ msgstr "Nájdené %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Priečinok"
@@ -968,8 +968,8 @@ msgstr "/Nový _Priečinok"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -988,7 +988,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -999,7 +999,7 @@ msgstr "Meno:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1047,7 +1047,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1161,7 +1161,7 @@ msgstr "Chyba pri konverzii adresára"
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Ovládanie"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Priečinok"
@@ -1258,7 +1258,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Žiadna"
 
@@ -1271,7 +1271,7 @@ msgid "/_Remove"
 msgstr "/_Odstrániť"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -1733,12 +1733,12 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Odoslať"
 
@@ -1780,7 +1780,7 @@ msgstr "Pripojiť súbor"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1789,8 +1789,8 @@ msgid "Insert signature"
 msgstr "Vložiť podpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1818,7 +1818,7 @@ msgstr "Súbor neexistuje alebo je prázdny."
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kódová stránka"
 
@@ -2049,12 +2049,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2072,7 +2072,7 @@ msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2223,42 +2223,42 @@ msgstr "Spoolovací priečinok"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2267,7 +2267,7 @@ msgstr "Nedá sa vytvoriť priečinok `%s'."
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
@@ -2276,7 +2276,7 @@ msgstr "/_Premenovať priečinok..."
 msgid "/_Move folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
@@ -2285,7 +2285,7 @@ msgstr "/_Zmazať priečinok"
 msgid "/Empty _trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
@@ -2293,20 +2293,20 @@ msgstr "/P_rijať nové správy"
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Vy_hľadať v správach..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žiadne neprečítané správy."
@@ -2319,81 +2319,81 @@ msgstr "/Prih_lásiť sa do diskusnej skupiny"
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,21 +2403,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Priečinok '%s' sa nedá odstrániť."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2426,12 +2431,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2442,21 +2447,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2465,34 +2470,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2617,7 +2622,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2638,7 +2643,7 @@ msgstr "Dokončiť"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
@@ -3577,52 +3582,52 @@ msgstr "/Nápo_veda/---"
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3633,16 +3638,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3652,149 +3657,149 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3851,25 +3856,25 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4036,11 +4041,11 @@ msgstr "Nastavenie konta"
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Súkromie"
 
@@ -4048,7 +4053,7 @@ msgstr "Súkromie"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Rozšírené"
 
@@ -4175,7 +4180,7 @@ msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatická"
 
@@ -4220,8 +4225,8 @@ msgstr "Generovať Message-ID"
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Upresniť... "
 
@@ -4553,88 +4558,88 @@ msgstr "Zmazať akciu"
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Vytváram okno všeobecných nastavení...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Automaticky zisťovať novú poštu"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minút"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prijať lokálnu poštu zo spoolu"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrovať pri prijímaní lokálnej pošty"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Uložiť odoslané správy"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4643,169 +4648,169 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
 "keď bude správa obsahovať iné znaky ako ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Vložiť automaticky"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automaticky zvoliť konto pri odpovedaní"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Pri odpovedaní citovať správu"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Počet spätných krokov"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Zalomiť pred odoslaním"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Uložiť medzi koncepty"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Obyčajný"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Formát odpovede"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Značka citácie"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Popis znakov "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Východzí inbox"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "písmen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Zoznam správ"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Správa"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4814,552 +4819,557 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
 "pre súčasnú lokalizáciu."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prispôsobiť veľkosť priložených obrázkov"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Zvoľte kľúče"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Zobraziť výsledok overenia ako upozornenie"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Vymazať z pamäte za"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minút "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
 " až do ukončenia)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Správy budú označené až do vykonania,\n"
 " ak je táto možnosť vypnutá)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Zobraziť meno"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostatné"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Okno prijímania"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Východzí inbox"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekúnd"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5383,11 +5393,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5401,7 +5411,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5413,20 +5423,20 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
@@ -5781,19 +5791,19 @@ msgstr "Príloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Dátum"
 
@@ -6466,98 +6476,98 @@ msgstr "\tVytváram zoznam správ..."
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Č."
 
@@ -6579,7 +6589,7 @@ msgstr "Táto správa sa nedá zobraziť.\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
@@ -6616,6 +6626,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Odoslať správy vo fronte"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O programe"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Ukončiť"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Vlastnosti priečinka"
diff --git a/po/sl.po b/po/sl.po
index d9eda3ab..5e6bd8b3 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -512,7 +512,7 @@ msgstr "Najden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mapa"
@@ -974,8 +974,8 @@ msgstr "/Nova _mapa"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -994,7 +994,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1005,7 +1005,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1166,7 +1166,7 @@ msgstr "Napaka pri pretvorbi imenika naslovov"
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Vmesnik"
 
@@ -1187,7 +1187,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Mapa"
@@ -1263,7 +1263,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Nič"
 
@@ -1276,7 +1276,7 @@ msgid "/_Remove"
 msgstr "/_Odstrani"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -1738,12 +1738,12 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Pošlji"
 
@@ -1785,7 +1785,7 @@ msgstr "Pripni datoteko"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Podpis"
 
@@ -1794,8 +1794,8 @@ msgid "Insert signature"
 msgstr "Vstavi podpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Urejevalnik"
 
@@ -1824,7 +1824,7 @@ msgstr "Datoteka ne obstaja ali pa je prazna."
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Nabor znakov"
 
@@ -2054,12 +2054,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2077,7 +2077,7 @@ msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2227,42 +2227,42 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2271,7 +2271,7 @@ msgstr "Ne morem narediti mape '%s'."
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
@@ -2280,7 +2280,7 @@ msgstr "/P_reimenuj mapo..."
 msgid "/_Move folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/I_zbriši mapo..."
 
@@ -2289,7 +2289,7 @@ msgstr "/I_zbriši mapo..."
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
@@ -2297,20 +2297,20 @@ msgstr "/_Preveri nova sporočila"
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporočil..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporočil."
@@ -2323,82 +2323,82 @@ msgstr "/_Vpis na novičarsko skupino..."
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2408,21 +2408,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Ne morem odstraniti mape '%s'"
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2431,12 +2436,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2447,21 +2452,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2470,34 +2475,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2622,7 +2627,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2643,7 +2648,7 @@ msgstr "Končaj"
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
@@ -3582,52 +3587,52 @@ msgstr "/_Pomoč/---"
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3638,16 +3643,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3656,149 +3661,149 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3855,25 +3860,25 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4040,11 +4045,11 @@ msgstr "Nastavitve računa"
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Zasebnost"
 
@@ -4052,7 +4057,7 @@ msgstr "Zasebnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4179,7 +4184,7 @@ msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -4223,8 +4228,8 @@ msgstr "Generiran ID sporočila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4554,257 +4559,257 @@ msgstr "Izbriši dejanje"
 msgid "Do you really want to delete this action?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Ustvarjam okno za splošne nastavitve...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Splošne nastavitve"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Samodejno preverjanje nove pošte"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "vsak"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Preveri novo pošto ob zagonu"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Posodobi vse lokalne mape po pripojitvi"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Pripoji iz spoola"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtriranje ob pripojitvi"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Shrani poslana sporočila v izhodno mapo"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Splošno"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Ločilo podpisa"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Vrini samodejno"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Samodejno izberi račun za odgovore"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citiraj sporočila ob odgovarjanju"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Samodejni zaženi zunanji urejevalnik"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Razveljavi nivo"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Prelom sporočila ob"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znakov"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Prelom citata"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Prelomi ob vnosu"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Shrani v imenik Draft"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normalno"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Oblika odgovora"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Znak za citiranje"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Oblika posredovanja"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Besedilo"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrajšaj novičarske skupine daljše od"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "Izbriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Sporočila"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4813,11 +4818,11 @@ msgstr ""
 "Če je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Omogoči barvanje sporočila"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4825,543 +4830,548 @@ msgstr ""
 "Prikaži večzložno abecedo in števila kot\n"
 "znake ASCII (samo japonščina)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavje nad ogledom sporočila"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "točk(e)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Izberite ključ"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Izbriši mapo"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Začasno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Poteče po"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavitev na '0' bo shranila prepustno frazo\n"
 " za celotno sejo)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vnašanjem gesla"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporočilom ni izbrana."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Sporočila bodo označena do izvršitve,\n"
 "če je to izklopljeno)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Prikaži ime"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Prikaži pogovorno okno za sprejem"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Vprašaj pred izpranjenjem"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Opozori, če so čakajoča sporočila"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Uporabi zunanji program za vključitev"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Samodejno (priporočeno)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitni ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Zahodnoevropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot desetiško število s 24-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot desteiško število z 12-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5385,11 +5395,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5403,7 +5413,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5415,20 +5425,20 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5784,19 +5794,19 @@ msgstr "Priloga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6467,99 +6477,99 @@ msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Ne."
 
@@ -6582,7 +6592,7 @@ msgstr "sporočilo ne bo sprejeto\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
@@ -6619,6 +6629,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "_Sporočilo/Poberi z vseh _računov"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "_Sporočilo/Poberi z vseh _računov"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Pošlji čakajoča sporočila"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Končaj"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Lastnost mape"
diff --git a/po/sr.po b/po/sr.po
index d4be6c8a..f61bcba5 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -513,7 +513,7 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -974,8 +974,8 @@ msgstr "/Novi _direktorijum"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -994,7 +994,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1005,7 +1005,7 @@ msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1054,7 +1054,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1160,7 +1160,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Izgled programa"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1257,7 +1257,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ništa"
 
@@ -1270,7 +1270,7 @@ msgid "/_Remove"
 msgstr "/_Skloni"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -1733,12 +1733,12 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Pošalji"
 
@@ -1780,7 +1780,7 @@ msgstr "Prikači datoteku"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Potpis"
 
@@ -1789,8 +1789,8 @@ msgid "Insert signature"
 msgstr "Unesi potpis"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Editor"
 
@@ -1819,7 +1819,7 @@ msgstr "Datoteka ne postoji ili je prazna."
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodiranje"
 
@@ -2049,12 +2049,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2072,7 +2072,7 @@ msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2222,42 +2222,42 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, 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:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2266,7 +2266,7 @@ msgstr "Ne mogu napraviti direktorijum `%s'."
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
@@ -2275,7 +2275,7 @@ msgstr "/P_reimenuj direktorijum..."
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
@@ -2284,7 +2284,7 @@ msgstr "/_Obriši direktorijum"
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
@@ -2292,20 +2292,20 @@ msgstr "/_Proveri ima li novih poruka"
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
@@ -2318,82 +2318,82 @@ msgstr "/Prijavi se na _news grupu..."
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, 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:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,21 +2403,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Ne mogu da premestim direktorijum `%s'."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2426,12 +2431,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2442,21 +2447,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2465,34 +2470,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2617,7 +2622,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Sled."
 
@@ -2638,7 +2643,7 @@ msgstr "Gotovo"
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
@@ -3578,52 +3583,52 @@ msgstr "/_Pomoć/---"
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3634,16 +3639,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3652,149 +3657,149 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3851,25 +3856,25 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4036,11 +4041,11 @@ msgstr "Podešavanje naloga"
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -4048,7 +4053,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4175,7 +4180,7 @@ msgid "Authentication method"
 msgstr "Način provere identieta"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -4219,8 +4224,8 @@ msgstr "Generiši ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4550,257 +4555,257 @@ msgstr "Obriši akciju"
 msgid "Do you really want to delete this action?"
 msgstr "Želite li zaista obrisati ovu akciju?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Stvaranje prozor za uobičajena podešavanja...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Uobičajena podešavanja"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Auto-provera nove pošte"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Proveri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Osveži sve direktorijume posle prihvatanja"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvataju"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Sačuvaj poslate poruke u poslato"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Glavno"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Odvaja potpis"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi nalog za odgovore"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Taster za odgovor povlači odgovor za listu"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni spoljašnji editor"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Undo nivo"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Sažmi pri unosu"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normalno"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Format proseđivanja"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Stalni ključ potpisa"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Tekst"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe duže od"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "slova"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Poruka"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4809,554 +4814,559 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišćen."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz podešavanje zaglavlja"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Ističe posle"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Postavljanje na '0' će smestiti loyinku\n"
 "u toku cele sesije)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sanduče posle primanja pošte"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Prikaz imena"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se završi"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredište kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Pitaj pre pražnjenja"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Koristi spoljni program za prihvatanje"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Evropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Evropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vreme"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vreme"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5380,11 +5390,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5398,7 +5408,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5410,20 +5420,20 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5779,19 +5789,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6465,99 +6475,99 @@ msgstr "\tPostavljanje pregleda od podataka poruke..."
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Ne."
 
@@ -6580,7 +6590,7 @@ msgstr "poruka neće biti primljena\n"
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
@@ -6617,6 +6627,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Poruka/Prove_ri sa svih naloga"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Poruka/Prove_ri sa svih naloga"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Šalje odložene poruku/e"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "O"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Izlaz"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Osobine direktorijuma"
diff --git a/po/sv.po b/po/sv.po
index 8b3040bd..94d8cdb0 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -510,7 +510,7 @@ msgstr "Fann %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
@@ -971,8 +971,8 @@ msgstr "/Ny _mapp"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -991,7 +991,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1002,7 +1002,7 @@ msgstr "Namn:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1157,7 +1157,7 @@ msgstr "Fel vid konvertering av adressbok"
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Gränssnitt"
 
@@ -1178,7 +1178,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Mapp"
@@ -1254,7 +1254,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ingen"
 
@@ -1267,7 +1267,7 @@ msgid "/_Remove"
 msgstr "/_Ta bort"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -1698,12 +1698,12 @@ msgstr "MIME-typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Skicka"
 
@@ -1745,7 +1745,7 @@ msgstr "Bifoga fil"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Signatur"
 
@@ -1754,8 +1754,8 @@ msgid "Insert signature"
 msgstr "Infoga signatur"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Redigerare"
 
@@ -1783,7 +1783,7 @@ msgstr "Filen finns inte eller är tom."
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodning"
 
@@ -2008,12 +2008,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2031,7 +2031,7 @@ msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2180,42 +2180,42 @@ msgstr "Välj katalog"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2224,7 +2224,7 @@ msgstr "Kan inte skapa mappen \"%s\"."
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
@@ -2232,7 +2232,7 @@ msgstr "/_Byt namn..."
 msgid "/_Move folder..."
 msgstr "/_Flytta..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
@@ -2240,7 +2240,7 @@ msgstr "/_Ta bort"
 msgid "/Empty _trash"
 msgstr "/Töm _papperskorgen"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
@@ -2248,20 +2248,20 @@ msgstr "/Ta emot nya _meddelanden"
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mappträd"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Sök meddelanden..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/_Hämta"
 
@@ -2273,81 +2273,81 @@ msgstr "/Prenumerera på _diskussionsgrupp"
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2357,21 +2357,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Kan inte ta bort mappen \"%s\"."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,12 +2385,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,20 +2403,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2420,34 +2425,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2572,7 +2577,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Nästa"
 
@@ -2593,7 +2598,7 @@ msgstr "Avsluta"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3513,50 +3518,50 @@ msgstr "/_Hjälp/---"
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3566,16 +3571,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3584,145 +3589,145 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Sätt som skräppost"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 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:2580
+#: src/mainwindow.c:2606
 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:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3779,24 +3784,24 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr "Meddelandet kommer att skrivas ut med följande kommando:"
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3962,11 +3967,11 @@ msgstr "Kontoinställningar"
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Integritet"
 
@@ -3974,7 +3979,7 @@ msgstr "Integritet"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Avancerat"
 
@@ -4099,7 +4104,7 @@ msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4140,8 +4145,8 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4471,85 +4476,85 @@ msgstr "Ta bort åtgärd"
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna åtgärd?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Skapar fönster för allmänna inställningar...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Allmänna inställningar"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Visa"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Skräppost"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Hämta ny post automatiskt"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "med"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "minuters mellanrum"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Hämta ny post vid uppstart"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Kör kommando när nytt meddelande anländer"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' kommer att ersättas med antalet nya meddelanden."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Inkorporera från spole"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Filtrera vid inkorporering"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Sökväg till spole"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Spara skickade meddelanden i kö-mappen"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Använd filterregler på sända meddelanden"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Kodning för överföring"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4557,167 +4562,167 @@ msgstr ""
 "Ange vilken kodning för överföring meddelandetexten\n"
 "ska ha när det innehåller icke-ASCII-tecken."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Allmänt"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Infoga automatiskt"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Välj automatiskt konto för svar"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Citera meddelande vid svar"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Svara-knappen ger svar till e-postlista"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Ångranivå"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Radbryt meddelanden vid"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Radbryt citering"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Radbryt vid indata"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Radbryt innan brevet skickas"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Spara i utkastsmapp"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Svarsformat"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Citationstecken"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Vidarebefordringsformat"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Beskrivning av symboler "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Förvald inkorg"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Text"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Mappvy"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Visa antal olästa bredvid mappnamn"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Visa meddelandeantalkolumner i mappvyn"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Förkorta diskussionsgrupper längre än"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "bokstäver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Ställ in fält att visa i summeringen... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4725,11 +4730,11 @@ msgstr ""
 "Om \"Automatisk\" är vald, kommer den optimala\n"
 "kodningen för det nuvarande språket att användas."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Aktivera färgläggning av meddelande"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4737,260 +4742,265 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanför meddelandevy"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Rendera HTML meddelanden som text"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Visa markören i meddelandevy"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Visa bilder som inline"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Använd Skräppostkontroll"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Lärande kommando:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Välj nycklar"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Inte Skräp"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Klassificerande kommando"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Skräpmapp"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Meddelanden som är markerade som skräppost flyttas till denna mapp"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrera meddelanden klassificerade som skräp vid mottagning"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Ta bort från server"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Undersök signaturer automatiskt"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturundersökning i ett extrafönster"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra lösenfras temporärt i minnet"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Utgår efter"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Om 0 angivits kommer lösenfrasen att lagras hela sessionen."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Håll fokus under inskrivning av lösenfas"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Öppna alltid meddelanden i summering, när de valts"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Öppna första olästa meddelande vid öppning av mapp"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå till inkorgen efter att ny post kommit"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Meddelanden kommer endast vara markerade tills exekvering om detta är "
 "avstängt)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Gör ordningen på knapparna enligt GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Visat namn"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr "Ställ in tangentbindningar..."
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Övrigt"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Kör kommando"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid hämtningsfel"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog efteråt"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Fråga innan tömning"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Förvald webbläsare)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Använd externt program för hämtning"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Använd strikt kontroll av integriteten för summeringscache"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5000,264 +5010,264 @@ msgstr ""
 "applikationer.\n"
 "Detta val kommer att försämra kapaciteten för visa summering."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Väntetid för uttags-I/O (socket I/O):"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitars ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreisk (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesisk (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5281,11 +5291,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5299,7 +5309,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5311,19 +5321,19 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "Välj förvalda tangentbindningar..."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
@@ -5651,19 +5661,19 @@ msgstr "Bilaga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Datum"
 
@@ -6333,97 +6343,97 @@ msgstr "\tSkapar summering från meddelandedata..."
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Nr."
 
@@ -6444,7 +6454,7 @@ msgstr "Detta meddelande kan inte visas.\n"
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
@@ -6481,6 +6491,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Skicka köade meddelanden"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Avsluta"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Mappegenskaper"
diff --git a/po/tr.po b/po/tr.po
index 023ee450..2ea7f2f3 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -511,7 +511,7 @@ msgstr "%s bulundu\n"
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "dizin:"
@@ -971,8 +971,8 @@ msgstr "/Yeni _Dizin"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -991,7 +991,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1002,7 +1002,7 @@ msgstr "İsim:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1051,7 +1051,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1162,7 +1162,7 @@ msgstr "Adres Defteri Çevrim Hatası"
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Arayüz"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Dizin"
@@ -1259,7 +1259,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1272,7 +1272,7 @@ msgid "/_Remove"
 msgstr "/_Sil"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
@@ -1726,12 +1726,12 @@ msgstr "MIME türü"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Gönder"
 
@@ -1773,7 +1773,7 @@ msgstr "Dosya ekle"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "İmza"
 
@@ -1782,8 +1782,8 @@ msgid "Insert signature"
 msgstr "İmza ekle"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Düzenleyici"
 
@@ -1811,7 +1811,7 @@ msgstr "Dosya yok, ya da boş."
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Kodlama"
 
@@ -2042,12 +2042,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2065,7 +2065,7 @@ msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2215,42 +2215,42 @@ msgstr "Dizini seç"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2259,7 +2259,7 @@ msgstr "`%s' dizini oluşturulamıyor."
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/D_izinin adını değiştir"
 
@@ -2268,7 +2268,7 @@ msgstr "/D_izinin adını değiştir"
 msgid "/_Move folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
@@ -2276,7 +2276,7 @@ msgstr "/Dizini _sil"
 msgid "/Empty _trash"
 msgstr "/Çö_pü boşalt"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
@@ -2284,20 +2284,20 @@ msgstr "/Y_eni iletileri al"
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin ağacını _yeniden yarat"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/İ_letilerda ara..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/İ_ndir"
 
@@ -2309,81 +2309,81 @@ msgstr "/_Haber grubuna üye ol..."
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2393,21 +2393,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "`%s' dizini silinemiyor."
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2416,12 +2421,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2432,21 +2437,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2455,34 +2460,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2607,7 +2612,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2628,7 +2633,7 @@ msgstr "Bitir"
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
@@ -3554,51 +3559,51 @@ msgstr "/Yardı_m/---"
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, 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:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, 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:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3609,16 +3614,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3627,146 +3632,146 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 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:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3823,25 +3828,25 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4008,11 +4013,11 @@ msgstr "Hesap tercihleri"
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Gizlilik"
 
@@ -4020,7 +4025,7 @@ msgstr "Gizlilik"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Gelişmiş"
 
@@ -4146,7 +4151,7 @@ msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -4191,8 +4196,8 @@ msgstr "İleti Numarası Oluştur"
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Düzenle... "
 
@@ -4525,88 +4530,88 @@ msgstr "Eylemi sil"
 msgid "Do you really want to delete this action?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Genel tercihler penceresi oluşturuluyor...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Genel Tercihler"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Görünüm"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Yeni postaları otomatik denetle"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "her"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "dakikada"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Açılışta yeni e-postaları denetle"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Komut"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "Spooldan dağıt"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Dağıtım filtresi"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Makara konumu"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Gönderilen iletileri giden kutusuna kaydet"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Transfer kod kümesi"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4615,169 +4620,169 @@ msgstr ""
 "Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
 "İçerik Transfer Kodlamasını seçiniz."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Genel"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "İmza ayıracı"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Otomatik ekle"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Yanıtlamalarda hesabı otomatik seç"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Yanıtlarken alıntı yap"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Harici düzenleyici otomatik çalıştır"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Geri alma seviyesi"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "İletileri kaydır: "
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Alıntı Kaydırması"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Girdide Kaydır"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Göndermeden önce kaydır"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Taslak dizinine kaydet"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Normal"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Yanıtlama formatı"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Alıntı işareti"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Yönlendirme biçimi"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Sembollerin açıklaması "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Metin"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Dizin"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "posta"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Özet Görünüm"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Özetin görüntü nesnesini belirt"
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "İleti"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4786,11 +4791,11 @@ msgstr ""
 "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
 "kümesi kullanılacaktır."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "İletileri renklendir"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4798,541 +4803,546 @@ msgstr ""
 "Çok bytelı alfabe veya numaraları \n"
 "ASCII karakter olarak göster(Sadece Japonca)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Postaları gösterirken üst kısımda başlıkları göster"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Görüntü başlığı ayarları"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Anahtarları Seçin"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Sunucudan sil"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "İmzaları otomatik denetle"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolayı geçici olarak hafızada sakla"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Belirtilen süre sonra geçerliliğini yitir"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Bu değere '0' atayarak parolanın\n"
 "tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Parolayı girerken girdiyi yakala"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "İleti geldiğinde gelen kutusuna git"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
 "postalar işaretlenecektir.)"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Görüntülenecek İsim"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Diğer"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Alma penceresini göster"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "İşlemler tamamlandığında alma penceresini kapat"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Çift tıklandığında adresi hedefe ekle"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Çıkışta"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Çıkışta sor"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Çıkışta çöpü boşalt"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Boşaltmadan önce sor"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Dağıtım için harici program kullan"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman aşımı:"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Otomatik (Önerilen)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Batı Avrupa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Orta Avrupa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5355,11 +5365,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5373,7 +5383,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5385,20 +5395,20 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
@@ -5728,19 +5738,19 @@ msgstr "Ek"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Tarih"
 
@@ -6416,97 +6426,97 @@ msgstr "\tİleti bilgisinden özet atanıyor..."
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Hayır."
 
@@ -6528,7 +6538,7 @@ msgstr "Bu mesaj görüntülenemiyor.\n"
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
@@ -6568,6 +6578,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/İ_leti/_Al/T_üm hesaplardan al"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Kuyruktaki iletileri gönder"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Hakkında"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Çık"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr " Dizin Ayarları"
diff --git a/po/uk.po b/po/uk.po
index b7097d09..1665833c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-10-22 17:21+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -517,7 +517,7 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
@@ -976,8 +976,8 @@ msgstr "/Нова папка"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -996,7 +996,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1007,7 +1007,7 @@ msgstr "Ім'я:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1055,7 +1055,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1160,7 +1160,7 @@ msgstr "Помилка при конвертуванні адресної кни
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Інтерфейс"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Папка"
@@ -1257,7 +1257,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Ніякий"
 
@@ -1270,7 +1270,7 @@ msgid "/_Remove"
 msgstr "/Видалити"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
@@ -1700,12 +1700,12 @@ msgstr "тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Послати"
 
@@ -1747,7 +1747,7 @@ msgstr "Приєднати файл"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Підпис"
 
@@ -1756,8 +1756,8 @@ msgid "Insert signature"
 msgstr "Вставити підпис"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Редактор"
 
@@ -1785,7 +1785,7 @@ msgstr "Файл не існує або порожній."
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Кодування"
 
@@ -2010,12 +2010,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2033,7 +2033,7 @@ msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2182,42 +2182,42 @@ msgstr "Обрати папку"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -2226,7 +2226,7 @@ msgstr "Не вдалось створити папку `%s'."
 msgid "/Create _new folder..."
 msgstr "/Створити нову папку..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Перейменувати папку..."
 
@@ -2234,7 +2234,7 @@ msgstr "/Перейменувати папку..."
 msgid "/_Move folder..."
 msgstr "/Перенести папку..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/Видалити папку"
 
@@ -2242,7 +2242,7 @@ msgstr "/Видалити папку"
 msgid "/Empty _trash"
 msgstr "/Спорожнити кошик"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
@@ -2250,20 +2250,20 @@ msgstr "/Перевірити за новими листами"
 msgid "/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/Шукати листи..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Завантажити"
 
@@ -2275,81 +2275,81 @@ msgstr "/Передплатити конференцію"
 msgid "/_Remove newsgroup"
 msgstr "/Видалити конференцію"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2359,21 +2359,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Не вдалось видалити папку `%s'."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2382,12 +2387,12 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Видалити папку"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2405,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2427,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2574,7 +2579,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Далі"
 
@@ -2595,7 +2600,7 @@ msgstr "Закінчити"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d нових листів"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3515,50 +3520,50 @@ msgstr "/Довідка/---"
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3568,16 +3573,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3587,145 +3592,145 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Вважати мотлохом"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3782,25 +3787,25 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Вивчення команди:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3966,11 +3971,11 @@ msgstr "Налаштування запису"
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3978,7 +3983,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Advanced"
 
@@ -4103,7 +4108,7 @@ msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4144,8 +4149,8 @@ msgstr "Генерувати Message-ID"
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Редагувати... "
 
@@ -4475,85 +4480,85 @@ msgstr "Видалити дію"
 msgid "Do you really want to delete this action?"
 msgstr "Ви дійсно бажаєте видалити цю дію?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Створюємо вікно загальних опцій...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Загальні налаштування"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Відображення"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Мотлох"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "кожні"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "хвилин"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Перевіряти нову пошту при запуску"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Оновлювати всі локальні папки після прийому"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Виконувати команду після прибуття нових листів"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' буде замінено на кількість нових листів."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Отримувати з локального спулу"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Фільтрувати при прийомі"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Шлях до спулу"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Зберігати відіслані листи в outbox"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Застосувати правила фільтрування до відісланих листів"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Кодування пересилки"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4561,167 +4566,167 @@ msgstr ""
 "Вкажіть Content-Transfer-Encoding для вживання, якщо тіло листа містить не-"
 "ASCII символи."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Загальні"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Розділювач підпису"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Вставити автоматично"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Автоматично вибирати запис для відповідей"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Цитувати лист при відповіді"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Кнопка відповіді запускає відповідь конференції"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Автоматично запускати зовнішній редактор"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Рівень Undo"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Згортати рядки листів після"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "символів"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Згортати цитування"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Згорнути при вводі"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Згортати перед відсиланням"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Зберегти в папці чернеток"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Нормальний"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Формат відповіді"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Знак цитати"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Формат пересилання"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Опис символів "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Вхідна папка по замовчуванню"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Текст"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "Відображення папок"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Показувати кількість непрочитаного після назви папки"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "Показувати колонки номера листа при відображенні папок"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скорочувати назви конференцій, довші ніж"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "літер"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Список повідомлень"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Формат дати"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Показувати наступні поля... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4729,11 +4734,11 @@ msgstr ""
 "Якщо включено `Автоматична', буде обрано оптимальне кодування для діючої "
 "locale."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Дозволити розфарбування листів"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4741,258 +4746,263 @@ msgstr ""
 "Відображати 2-байтний алфавіт і числа\n"
 "однобайтним символом (для японської мови)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Показувати панель заголовка над листом"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Показувати скорочені заголовки при перегляді листів"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Зображати HTML-листи як текст"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Показувати курсор при відображенні папок"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Міжрядковий інтервал"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "пікселів"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Півсторінки"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Плавна прокрутка"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Зображення"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабувати приєднані картинки відповідно до вікна"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Відображати зображення в тілі листа"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Ввімкнути контроль мотлоху"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Вивчення команди:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Обрати ключі"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Не мотлох"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Класифікувати команду"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Папка мотлоху"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Листи, позначені як мотлох, складаємо у цій папці."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фільтрувати листи, класифіковані як мотлох, при отриманні"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Видалити з сервера"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Автоматично перевіряти підписи"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Показувати результат перевірки підпису у спливаючому вікні"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Тимчасово зберігати пароль в пам'яті"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Недійсний після"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "хвилин "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Присвоєння '0' зберігає пароль протягом всієї сесії."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Захопити ввід при введенні паролю"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Попереджати при запуску, якщо GnuPG не працює"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Завжди відкривати листи у списку при виділенні"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Відкривати перший непрочитаний лист, входячи в папку"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Переходити у папку `Вхідні', отримавши нову пошту"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Виконувати негайно після видалення чи переміщення листів"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Листи буде позначено до виконання, якщо це вимкнути."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Узгоджувати порядок кнопок з GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Ім'я для списку"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Встановити гарячі клавіші... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Інше"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Виконати команду"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Діалог отримання"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Показувати діалог отримання"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Завжди"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Тільки при ручному отриманні"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Не видавати діалог при помилці отримання"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Закрити діалог отримання після завершення"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Додати адресу до призначення, коли клацнути двічі"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "При виході"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Підтвердити при виході"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "При виході очищати кошик"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Питати перед очищенням"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Попереджати, якщо є листи в черзі"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(Браузер за замовчуванням)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Вживати зовнішню програму для прийому"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Вживати зовнішню програму для відсилання"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Ввімкнути строгу перевірку цілісності кешів"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5001,264 +5011,264 @@ msgstr ""
 "Ввімкнути, якщо вміст папок може змінюватись іншими програмами.\n"
 "Ця опція погіршить відображення списка повідомлень."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета вводу/виводу"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Автоматична (рекомендовано)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Західноєвропейська (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Цнтральноєвропейська (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтійська (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтійська (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Єврейська (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Єврейська (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилиця (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрощена китайська (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5282,11 +5292,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5300,7 +5310,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5312,19 +5322,19 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr " Обрати попередньо означені гарячі клавіші."
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "По замовчуванню"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
@@ -5652,19 +5662,19 @@ msgstr "Вкладення"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Дата"
 
@@ -6333,97 +6343,97 @@ msgstr "\tФормуємо список з даних листів..."
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Номер"
 
@@ -6444,7 +6454,7 @@ msgstr "Цей лист неможливо відобразити.\n"
 msgid "Sa_ve this image as..."
 msgstr "/Зберегти зображення як..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
@@ -6481,6 +6491,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/Лист/Отримати/Для поточного запису"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/Лист/Отримати/Для всіх записів"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Відіслати лист(и) з черги"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Про програму"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Вихід"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Властивості папки"
diff --git a/po/vi.po b/po/vi.po
index 341356a3..1109130b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-11-30 23:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -509,7 +509,7 @@ msgstr "Tìm thấy %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Cấu hình đã được lưu.\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
@@ -954,8 +954,8 @@ msgstr "/Thư _mục mới"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -974,7 +974,7 @@ msgstr "/_Xoá"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -985,7 +985,7 @@ msgstr "Tên:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1033,7 +1033,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1142,7 +1142,7 @@ msgstr "Lỗi chuyển đổi sổ địa chỉ"
 msgid "Addressbook Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "Giao diện"
 
@@ -1163,7 +1163,7 @@ msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "Thư mục"
@@ -1239,7 +1239,7 @@ msgstr "Nâu"
 #. 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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "Không"
 
@@ -1252,7 +1252,7 @@ msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
@@ -1682,12 +1682,12 @@ msgstr "Kiểu MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "Gửi"
 
@@ -1729,7 +1729,7 @@ msgstr "Đính kèm tập tin"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "Chữ kí"
 
@@ -1738,8 +1738,8 @@ msgid "Insert signature"
 msgstr "Chèn chữ kí"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
@@ -1767,7 +1767,7 @@ msgstr "Tập tin không tồn tại hoặc rỗng."
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "Mã hoá"
 
@@ -1992,12 +1992,12 @@ msgstr "Sửa thư mục"
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2015,7 +2015,7 @@ msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2165,42 +2165,42 @@ msgstr "Chọn thư mục"
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2209,7 +2209,7 @@ msgstr "Không tạo được thư mục `%s'."
 msgid "/Create _new folder..."
 msgstr "/Tạo thư mục _mới..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/Đổi _tên thư mục..."
 
@@ -2217,7 +2217,7 @@ msgstr "/Đổi _tên thư mục..."
 msgid "/_Move folder..."
 msgstr "/_Di chuyển thư mục..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/_Xoá thư mục"
 
@@ -2225,7 +2225,7 @@ msgstr "/_Xoá thư mục"
 msgid "/Empty _trash"
 msgstr "/Đổ _rác"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/_Kiểm tra thư mới"
 
@@ -2233,20 +2233,20 @@ msgstr "/_Kiểm tra thư mới"
 msgid "/R_ebuild folder tree"
 msgstr "/_Làm lại cây thư mục"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/_Tìm thư..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/Tải _về"
 
@@ -2258,81 +2258,81 @@ msgstr "/Đăng kí vào _nhóm tin..."
 msgid "/_Remove newsgroup"
 msgstr "/_Xoá nhóm tin"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "Đang tạo khung thư mục...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "Mới"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Chưa đọc"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "Thiết lập thông tin thư mục...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "Làm lại cây thư mục"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Cây thư mục sẽ được làm lại. Tiếp tục?"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "Đang làm lại cây thư mục..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "Việc làm lại cây thư mục thất bại."
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2342,21 +2342,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "Không thể xoá thư mục `%s'."
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2365,12 +2370,12 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Xoá thư mục"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2383,21 +2388,21 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục `%s'."
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2406,34 +2411,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2558,7 +2563,7 @@ msgstr "Nhập khẩu tập tin LDIF vào sổ địa chỉ"
 msgid "Prev"
 msgstr "Trước"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "Tiếp"
 
@@ -2579,7 +2584,7 @@ msgstr "Hoàn thành"
 msgid "Sylpheed: %d new messages"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "Sylpheed cũ"
@@ -3501,51 +3506,51 @@ msgstr "/Cấ_u hình/---"
 msgid "Creating main window...\n"
 msgstr "Đang tạo cửa sổ chính...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "xong.\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "Chưa đặt tên"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "không"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Đổi kiểu vạch phân cách cửa sổ từ %d sang %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3556,16 +3561,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3574,145 +3579,145 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "Lấy"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "Sáp nhập thư mới"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "Lấy tất"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "Sáp nhật thư mới của mọi tài khoản"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "Gửi thư đang đợi"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Viết thư"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "Viết thư mới"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "Hồi âm"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "Hồi âm cho thư"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "Hồi âm tất cả"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "Hồi âm cho tất cả"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "Chuyển tiếp thư"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "Xoá thư"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "Coi là thư rác"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "Chạy"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "Thư chưa đọc tiếp theo"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr ""
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "Cấu hình chung"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Tài khoản"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "Thiết lập tài khoản"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
@@ -3769,25 +3774,25 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Lệnh thu thập:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3951,11 +3956,11 @@ msgstr "Cấu hình tài khoản"
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "Riêng tư"
 
@@ -3963,7 +3968,7 @@ msgstr "Riêng tư"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "Nâng cao"
 
@@ -4088,7 +4093,7 @@ msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "Tự động"
 
@@ -4129,8 +4134,8 @@ msgstr "Tạo ID của thư"
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " Soạn... "
 
@@ -4459,85 +4464,85 @@ msgstr "Xoá hành động"
 msgid "Do you really want to delete this action?"
 msgstr "Bạn có thực sự muốn xoá hành động này?"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình chung...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "Cấu hình chung"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "Hiển thị"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "Thư rác"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "Tự động kiểm tra thư mới"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "mỗi"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "phút"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "Kiểm tra thư mới khi chạy chương trình"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "Cập nhập mọi thư mục cục bộ sau khi sáp nhập"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "Chạy lệnh khi có thư mới"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "Lệnh"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "`%d' sẽ được thay thế tương ứng với số thư mới."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "Sáp nhập từ spool cục bộ"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "Lọc khi sáp nhập"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Đường dẫn spool"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "Lưu thư đã gửi vào hộp gửi"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "Áp dụng quy tắc lọc cho thư đã gửi"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "Mã kí tự khi chuyển"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4545,169 +4550,169 @@ msgstr ""
 "Chỉ định Mã-kí-tự-khi-chuyển-nội-dung sẽ được dùng khi nội dung thư chứa các "
 "kí tự không phải ASCII."
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Chung"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "Vạch phân cách chữ kí"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "Chèn tự động"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "Tự động chọn tài khoản để hồi âm"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "Trích dẫn thư khi hồi âm"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "Nhấn nút Hồi âm để hồi âm cho hộp thư chung"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "Tự động chạy trình soạn thảo ngoài"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "Mức hoàn tác"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "Khuôn dòng thư tại"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "kí tự"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "Khuôn dòng phần trích dẫn"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "Khuôn dòng khi nhập"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "Khuôn dòng trước khi gửi"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "Bình thường"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "Định dạng hồi âm"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "Dấu trích dẫn"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "Định dạng chuyển tiếp"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " Giải thích các kí hiệu "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "Văn bản"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "Thư mục"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "Hiển thị số thư chưa đọc ngay sau tên thư mục"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "Hiển thị số thư chưa đọc ngay sau tên thư mục"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "Viết tắt khi tên nhóm tin dài hơn"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "chữ cái"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "Khung xem tóm tắt"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Hiện người nhận trên cột `Người gửi' nếu người gửi là bạn"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "Mở rộng các luồng thư"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "Định dạng thời gian"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " Đặt các mục hiển thị trên bảng tóm tắt... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "Thư"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Xem/Mã _kí tự"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "Mã kí tự đầu ra"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4715,11 +4720,11 @@ msgstr ""
 "Nếu chọn `Tự động', mã kí tự tối ưu cho thiết lập bản địa hiện tại sẽ được "
 "dùng."
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "Cho phép màu sắc trong thư"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4727,260 +4732,265 @@ msgstr ""
 "Hiển thị bảng chữ cái và chữ số đa byte\n"
 "ở dạng kí tự ASCII (chỉ tiếng Nhật)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "Hiện ô header phía trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "Hiện header dạng ngắn gọn trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "Hiển thị HTML ở dạng văn bản thuần tuý"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "Hiển thị con trỏ trong khung xem thư"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "Khoản cách dòng"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "Cuộn"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "Nửa trang"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "Cuộn trơn"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "Bước"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "Hình ảnh"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "Đổi kích thước ảnh to cho vừa với cửa sổ"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "Hiện hình ảnh ngay trên dòng"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "Cho phép điều khiển thư rác"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "Lệnh thu thập:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Chọn khoá"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "Không phải thư rác"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "Lệnh phân loại"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "Thư mục thư rác"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Các thư bị đánh dấu là thư rác sẽ được chuyển tới thư mục này."
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "Lọc thư được phân loại là thư rác lúc nhận"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Xoá khỏi máy chủ"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "Tự động kiểm tra chữ kí"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "Hiện kết quả kiểm tra chữ kí trong cửa sổ popup"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "Lưu tạm mật khẩu vào bộ nhớ"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "Hết hạn sau"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "phút "
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Đặt là '0' để lưu mật khẩu trong suốt phiên làm việc."
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "Bắt (grab) đầu vào khi nhập mật khẩu"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Hiển thị cảnh báo lúc khởi động nếu GnuPG không hoạt động"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "Luôn mở thư trong phần tóm tắt khi được chọn"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "Mở thư chưa đọc đầu tiên khi vào một thư mục"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "Chỉ đánh dấu thư là đã đọc khi mở trong cửa sổ mới"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "Đi đến hộp nhận sau khi nhận thư mới"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Thực thi ngay lập tức khi di chuyển hoặc xoá thư"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Thư sẽ được đánh dấu đến khi thực thi nếu không dùng tuỳ chọn này."
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Sắp xếp thứ tự các nút tương ứng với GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "Tên hiển thị"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " Đặt phím tắt... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "Khác"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "Chạy lệnh"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "Hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "Hiện hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "Chỉ khi nhận theo kiểu thủ công"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "Không hiện hộp thoại báo lỗi kiểu popup khi gặp lỗi"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "Đóng hộp thoại nhận thư khi hoàn thành"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "Thêm địa chỉ vào đích đến khi nhấn đúp"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "Lúc thoát"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "Xác nhận khi thoát"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "Đổ rác khi thoát"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "Hỏi trước khi đổ rác"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "Cảnh báo nếu có thư chờ được gửi"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Lệnh ngoài (%s sẽ được thay thế bằng tên tập tin / URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "Trình duyệt"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "Dùng chương trình ngoài để sáp nhập"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 "Cho phép kiểm tra nghiêm ngặt về tính toàn vẹn của bộ đệm của bảng tóm tắt"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -4990,264 +5000,264 @@ msgstr ""
 "đổi.\n"
 "Tuỳ chọn này sẽ suy giảm hiệu năng của việc hiển thị bảng tóm tắt."
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "Hết hạn I/O socket"
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "giây"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "Tự động (Khuyến cáo)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "Đông Âu (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "Tây Âu (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Tây Âu (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "Trung Âu (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "Hi Lạp (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Do Thái (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "Do Thái (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "Thổ Nhĩ Kì(ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Nhật Bản (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "Nhật Bản (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "Nhật Bản (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "Hán giản thể (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "Hán giản thể (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "Hán phồn thể (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Hán phồn thể (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hán (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "Triều Tiên (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "Thái (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "Thái (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "dạng viết tắt của ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "dạng đầy đủ tên ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "dạng viết tắt của tên tháng"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "dạng đầy đủ của tên tháng"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "định dạng thời gian cho locale hiện tại"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "thế kỉ (năm/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "ngày trong tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 24 giờ"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 12 giờ"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "ngày trong năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "phút ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "hoặc là AM hoặc là PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "giây ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "ngày trong tuần ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "định dạng ưu tiên cho ngày tháng của locale hiện tại"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "hai số cuối của năm"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "múi giờ hoặc tên hoặc dạng viết tắt"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "Kí hiệu"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "Miêu tả"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "Ví dụ"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "Đặt màu cho thư"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "Nội dung trích dẫn - Cấp 1"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "Nội dung trích dẫn - Cấp 2"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "Nội dung trích dẫn - Cấp 3"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "Liên kết URI"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "Lặp lại theo vòng"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "Chọn màu cho phần trích dẫn cấp 1"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "Chọn màu cho phần trích dẫn cấp 2"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "Chọn màu cho phần trích dẫn cấp 3"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "Chọn màu cho URI"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "Miêu tả về biểu tượng"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5271,11 +5281,11 @@ msgstr ""
 "Nhóm tin\n"
 "ID của thư"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "Nếu x đã được đặt, hiển thị expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5289,7 +5299,7 @@ msgstr ""
 "Nội dung thư được trích dẫn không gồm chữ kí\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5301,20 +5311,20 @@ msgstr ""
 "Dấu ngoặc nhọn mở\n"
 "Dấu ngoặc nhọn đóng"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "Phím tắt"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Đặt phím tắt... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "Mặc định"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "Sylpheed cũ"
 
@@ -5643,19 +5653,19 @@ msgstr "Đính kèm"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6327,97 +6337,97 @@ msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "Số "
 
@@ -6438,7 +6448,7 @@ msgstr "Không thể hiển thị được thư này.\n"
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
@@ -6475,6 +6485,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/_Thư/_Nhận/_Từ tài khoản mặc định"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "Gửi thư đang đợi"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "Giới thiệu"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "Thoát"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "Thuộc tính thư mục"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a3c53cb8..64c5d7b7 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: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+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"
@@ -506,7 +506,7 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -965,8 +965,8 @@ msgstr "/新建文件夹(_F)"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -985,7 +985,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "地址簿"
 
@@ -996,7 +996,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1044,7 +1044,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1148,7 +1148,7 @@ msgstr "地址簿转换错误"
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "界面"
 
@@ -1169,7 +1169,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "文件夹"
@@ -1245,7 +1245,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "没有"
 
@@ -1258,7 +1258,7 @@ msgid "/_Remove"
 msgstr "/删除(_R)"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
@@ -1690,12 +1690,12 @@ msgstr "MIME 类型"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "发送"
 
@@ -1737,7 +1737,7 @@ msgstr "加入附件"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "签名"
 
@@ -1746,8 +1746,8 @@ msgid "Insert signature"
 msgstr "插入签名"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "编辑器"
 
@@ -1775,7 +1775,7 @@ msgstr "文件不存在或为空。"
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "编码方式"
 
@@ -2004,12 +2004,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2027,7 +2027,7 @@ msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr " ... "
 
@@ -2177,42 +2177,42 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2221,7 +2221,7 @@ msgstr "无法创建文件夹“%s”。"
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
@@ -2230,7 +2230,7 @@ msgstr "/重命名文件夹(_R)..."
 msgid "/_Move folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/删除文件夹(_D)"
 
@@ -2238,7 +2238,7 @@ msgstr "/删除文件夹(_D)"
 msgid "/Empty _trash"
 msgstr "/清空废件箱(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
@@ -2246,20 +2246,20 @@ msgstr "/检查新邮件(_C)"
 msgid "/R_ebuild folder tree"
 msgstr "/重建文件夹树(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/查找邮件(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/下载(_L)"
 
@@ -2271,81 +2271,81 @@ msgstr "/订阅新闻组(_B)..."
 msgid "/_Remove newsgroup"
 msgstr "/删除新闻组(_R)"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,21 +2355,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "无法删除文件夹“%s”。"
+
+#: src/folderview.c:2270
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,12 +2383,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,21 +2399,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2417,34 +2422,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2569,7 +2574,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "下一个"
 
@@ -2590,7 +2595,7 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 #, fuzzy
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
@@ -3508,51 +3513,51 @@ msgstr "/帮助(_H)/---"
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3562,16 +3567,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3580,146 +3585,146 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3776,25 +3781,25 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3958,11 +3963,11 @@ msgstr "帐号首选项"
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "隐私"
 
@@ -3970,7 +3975,7 @@ msgstr "隐私"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "高级"
 
@@ -4096,7 +4101,7 @@ msgid "Authentication method"
 msgstr "验证方法"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "自动"
 
@@ -4141,8 +4146,8 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4470,266 +4475,266 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "正在创建通用首选项窗口...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "通用首选项"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 #, fuzzy
 msgid "Junk mail"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "邮件池路径"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "传输编码"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "常规"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "发送前折行"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "保存到草稿文件夹"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "普通"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "文本"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 #, fuzzy
 msgid "Folder View"
 msgstr "文件夹"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4737,534 +4742,539 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "选择密钥"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 #, fuzzy
 msgid "Classifying command"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "显示姓名"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5288,11 +5298,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5306,7 +5316,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5318,20 +5328,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -5661,19 +5671,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "日期"
 
@@ -6345,97 +6355,97 @@ msgstr "\t正在从邮件数据中设置摘要..."
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "No."
 
@@ -6456,7 +6466,7 @@ msgstr "无法显示该邮件。\n"
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
@@ -6496,6 +6506,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "发送队列中的邮件"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "关于"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "退出"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "文件夹属性"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 36e2ca13..c616fb22 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 16:01+0900\n"
+"POT-Creation-Date: 2006-01-13 18:13+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -511,7 +511,7 @@ msgstr "找到 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
-#: libsylph/prefs_common.c:488
+#: libsylph/prefs_common.c:490
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
@@ -968,8 +968,8 @@ msgstr "/新增資料夾(_F)"
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:287 src/folderview.c:289
-#: src/folderview.c:293 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
+#: src/folderview.c:295 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:406 src/summaryview.c:416 src/summaryview.c:418
 #: src/summaryview.c:420 src/summaryview.c:432 src/summaryview.c:438
 msgid "/---"
@@ -988,7 +988,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2190
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -999,7 +999,7 @@ msgstr "姓名："
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2345 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2371 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1047,7 +1047,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2327
+#: src/addressbook.c:1674 src/folderview.c:2346
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1153,7 +1153,7 @@ msgstr "轉換通訊錄格式時發生錯誤"
 msgid "Addressbook Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2040
 msgid "Interface"
 msgstr "介面"
 
@@ -1174,7 +1174,7 @@ msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:365 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:367 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:369
 msgid "Folder"
 msgstr "資料夾"
@@ -1250,7 +1250,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:317 src/summaryview.c:4428
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4429
 msgid "None"
 msgstr "無"
 
@@ -1263,7 +1263,7 @@ msgid "/_Remove"
 msgstr "/刪除(_R)"
 
 #: src/compose.c:509 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:297
+#: src/folderview.c:299
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
@@ -1692,12 +1692,12 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:495
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4575
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4576
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4665 src/mainwindow.c:2278 src/prefs_account_dialog.c:525
-#: src/prefs_common_dialog.c:661
+#: src/compose.c:4665 src/mainwindow.c:2304 src/prefs_account_dialog.c:525
+#: src/prefs_common_dialog.c:664
 msgid "Send"
 msgstr "送出"
 
@@ -1739,7 +1739,7 @@ msgstr "附加檔案"
 
 #. signature
 #: src/compose.c:4714 src/prefs_account_dialog.c:1205
-#: src/prefs_common_dialog.c:954
+#: src/prefs_common_dialog.c:957
 msgid "Signature"
 msgstr "簽章"
 
@@ -1748,8 +1748,8 @@ msgid "Insert signature"
 msgstr "插入簽章"
 
 #. editor
-#: src/compose.c:4724 src/prefs_common_dialog.c:992
-#: src/prefs_common_dialog.c:2311
+#: src/compose.c:4724 src/prefs_common_dialog.c:995
+#: src/prefs_common_dialog.c:2322
 msgid "Editor"
 msgstr "編輯器"
 
@@ -1777,7 +1777,7 @@ msgstr "檔案不存在或者是空的。"
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5301 src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1451
 msgid "Encoding"
 msgstr "編碼"
 
@@ -2002,12 +2002,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2080
-#: src/folderview.c:2086
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
+#: src/folderview.c:2101
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2087
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2025,7 +2025,7 @@ msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1715
-#: src/prefs_common_dialog.c:1849
+#: src/prefs_common_dialog.c:1852
 msgid " ... "
 msgstr "..."
 
@@ -2174,42 +2174,42 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:359 src/folderview.c:1166 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:363 src/folderview.c:1172 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:367 src/folderview.c:1178 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:371 src/folderview.c:1184 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:375 src/folderview.c:1190 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2084 src/folderview.c:2088
+#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:550 src/folderview.c:2096 src/folderview.c:2157
+#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:560 src/folderview.c:2106 src/folderview.c:2165
+#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2113
+#: src/foldersel.c:568 src/folderview.c:2128
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2218,7 +2218,7 @@ msgstr "無法建立資料夾「%s」。"
 msgid "/Create _new folder..."
 msgstr "/產生新的資料夾(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263
+#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
 msgid "/_Rename folder..."
 msgstr "/重新命名資料夾(_R)..."
 
@@ -2226,7 +2226,7 @@ msgstr "/重新命名資料夾(_R)..."
 msgid "/_Move folder..."
 msgstr "/移除資料夾(_M)..."
 
-#: src/folderview.c:245 src/folderview.c:265
+#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
 msgid "/_Delete folder"
 msgstr "/刪除資料夾(_D)"
 
@@ -2234,7 +2234,7 @@ msgstr "/刪除資料夾(_D)"
 msgid "/Empty _trash"
 msgstr "/清空刪除的郵件(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:290
+#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
 msgid "/_Check for new messages"
 msgstr "/檢查新郵件(_C)"
 
@@ -2242,20 +2242,20 @@ msgstr "/檢查新郵件(_C)"
 msgid "/R_ebuild folder tree"
 msgstr "/重建資料夾結構(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:292
+#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:294
+#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
 msgid "/_Search messages..."
 msgstr "/尋找郵件(_S)"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:295
+#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:288
+#: src/folderview.c:269 src/folderview.c:290
 msgid "/Down_load"
 msgstr "/下載(_L)"
 
@@ -2267,81 +2267,81 @@ msgstr "/預訂新聞群組(_B)"
 msgid "/_Remove newsgroup"
 msgstr "/移除新聞群組(_R)"
 
-#: src/folderview.c:318
+#: src/folderview.c:320
 msgid "Creating folder view...\n"
 msgstr "產生資料夾檢視...\n"
 
-#: src/folderview.c:396
+#: src/folderview.c:398
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:410 src/prefs_summary_column.c:71
+#: src/folderview.c:412 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:424
+#: src/folderview.c:426
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:555
+#: src/folderview.c:557
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:556
+#: src/folderview.c:558
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:856 src/mainwindow.c:3365 src/setup.c:80
+#: src/folderview.c:858 src/mainwindow.c:3384 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:860 src/mainwindow.c:3370 src/setup.c:85
+#: src/folderview.c:862 src/mainwindow.c:3389 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:902
+#: src/folderview.c:904
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:903
+#: src/folderview.c:905
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:912
+#: src/folderview.c:914
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:919
+#: src/folderview.c:921
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:1033
+#: src/folderview.c:1035
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1198 src/mainwindow.c:2354 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1200 src/mainwindow.c:2380 src/prefs_common_dialog.c:1796
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1830
+#: src/folderview.c:1843
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1985
+#: src/folderview.c:1998
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2020
+#: src/folderview.c:2035
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2081
+#: src/folderview.c:2096
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2351,21 +2351,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2160
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2146
+#: src/folderview.c:2161
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2251
+#: src/folderview.c:2192 src/folderview.c:2200
+#, fuzzy, c-format
+msgid "Can't rename the folder '%s'."
+msgstr "無法移除資料夾「%s」。"
+
+#: src/folderview.c:2270
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2336
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2374,12 +2379,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2319
+#: src/folderview.c:2338
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2324
+#: src/folderview.c:2343
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2392,20 +2397,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2356 src/folderview.c:2362
+#: src/folderview.c:2375 src/folderview.c:2381
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2398
+#: src/folderview.c:2417
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2418
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2438
+#: src/folderview.c:2457
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2414,34 +2419,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2459
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2509
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2491
+#: src/folderview.c:2510
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2644
+#: src/folderview.c:2663
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2645
+#: src/folderview.c:2664
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2695
+#: src/folderview.c:2714
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2696
+#: src/folderview.c:2715
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2566,7 +2571,7 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2374
+#: src/importldif.c:768 src/mainwindow.c:2400
 msgid "Next"
 msgstr "下一封"
 
@@ -2587,7 +2592,7 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:164
+#: src/inc.c:164 src/trayicon.c:89
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
@@ -3499,50 +3504,50 @@ msgstr "/說明(_H)/---"
 msgid "Creating main window...\n"
 msgstr "建立主視窗...\n"
 
-#: src/mainwindow.c:998
+#: src/mainwindow.c:1000
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1087 src/summaryview.c:2130 src/summaryview.c:2226
-#: src/summaryview.c:3588 src/summaryview.c:3709 src/summaryview.c:4061
+#: src/mainwindow.c:1091 src/summaryview.c:2131 src/summaryview.c:2227
+#: src/summaryview.c:3589 src/summaryview.c:3710 src/summaryview.c:4062
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1214 src/mainwindow.c:1255 src/mainwindow.c:1283
+#: src/mainwindow.c:1218 src/mainwindow.c:1259 src/mainwindow.c:1284
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1284
+#: src/mainwindow.c:1285
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1337
+#: src/mainwindow.c:1338
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1587
+#: src/mainwindow.c:1588
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1588
+#: src/mainwindow.c:1589
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1602
+#: src/mainwindow.c:1603
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1603
+#: src/mainwindow.c:1604
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1631
+#: src/mainwindow.c:1632
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1632
+#: src/mainwindow.c:1633
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3552,16 +3557,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1638 src/setup.c:49
+#: src/mainwindow.c:1639 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1643 src/setup.c:56
+#: src/mainwindow.c:1644 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1649 src/setup.c:62
+#: src/mainwindow.c:1650 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3570,145 +3575,145 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2042
+#: src/mainwindow.c:2068
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2061
+#: src/mainwindow.c:2087
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2213 src/summaryview.c:393
+#: src/mainwindow.c:2239 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2214
+#: src/mainwindow.c:2240
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2215
+#: src/mainwindow.c:2241
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2216
+#: src/mainwindow.c:2242
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2221 src/summaryview.c:400
+#: src/mainwindow.c:2247 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2222 src/summaryview.c:401
+#: src/mainwindow.c:2248 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2223 src/summaryview.c:402
+#: src/mainwindow.c:2249 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2259
+#: src/mainwindow.c:2285
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2286
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2267
+#: src/mainwindow.c:2293
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2268
+#: src/mainwindow.c:2294
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2279
+#: src/mainwindow.c:2305
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2289 src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
+#: src/mainwindow.c:2315 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:666 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2290
+#: src/mainwindow.c:2316
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2298 src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2324 src/prefs_common_dialog.c:979
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2299 src/mainwindow.c:2312
+#: src/mainwindow.c:2325 src/mainwindow.c:2338
 msgid "Reply to the message"
 msgstr "回覆郵件"
 
-#: src/mainwindow.c:2316
+#: src/mainwindow.c:2342
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2317
+#: src/mainwindow.c:2343
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2325 src/prefs_filter_edit.c:652
+#: src/mainwindow.c:2351 src/prefs_filter_edit.c:652
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2326 src/mainwindow.c:2339
+#: src/mainwindow.c:2352 src/mainwindow.c:2365
 msgid "Forward the message"
 msgstr "轉寄郵件"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2372
 msgid "Delete the message"
 msgstr "刪除郵件"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2381
 msgid "Set as junk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/mainwindow.c:2364
+#: src/mainwindow.c:2390
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2365
+#: src/mainwindow.c:2391
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2375
+#: src/mainwindow.c:2401
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2387
+#: src/mainwindow.c:2413
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2388
+#: src/mainwindow.c:2414
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2396 src/prefs_folder_item.c:290
+#: src/mainwindow.c:2422 src/prefs_folder_item.c:290
 #: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2397
+#: src/mainwindow.c:2423
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2569
+#: src/mainwindow.c:2595
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2580
+#: src/mainwindow.c:2606
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2789
+#: src/mainwindow.c:2829
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3765,25 +3770,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3132
+#: src/messageview.c:669 src/summaryview.c:3133
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:728 src/summaryview.c:3155
+#: src/messageview.c:728 src/summaryview.c:3156
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3156
+#: src/messageview.c:729 src/summaryview.c:3157
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3158
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3159
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:740 src/summaryview.c:3167
+#: src/messageview.c:740 src/summaryview.c:3168
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3948,11 +3953,11 @@ msgstr "帳號設定"
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:662
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:673
 msgid "Privacy"
 msgstr "私人資料"
 
@@ -3960,7 +3965,7 @@ msgstr "私人資料"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2112
 msgid "Advanced"
 msgstr "進階設定"
 
@@ -4085,7 +4090,7 @@ msgid "Authentication method"
 msgstr "認證方法"
 
 #: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
+#: src/prefs_common_dialog.c:877 src/prefs_common_dialog.c:2481
 msgid "Automatic"
 msgstr "自動"
 
@@ -4126,8 +4131,8 @@ msgstr "產生郵件識別碼"
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
-#: src/prefs_common_dialog.c:1580
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1556
+#: src/prefs_common_dialog.c:1583
 msgid " Edit... "
 msgstr " 編輯... "
 
@@ -4451,251 +4456,251 @@ msgstr "刪除指令"
 msgid "Do you really want to delete this action?"
 msgstr "您確定要刪除這個指令嗎？"
 
-#: src/prefs_common_dialog.c:639
+#: src/prefs_common_dialog.c:642
 msgid "Creating common preferences window...\n"
 msgstr "產生一般設定視窗...\n"
 
-#: src/prefs_common_dialog.c:643
+#: src/prefs_common_dialog.c:646
 msgid "Common Preferences"
 msgstr "一般設定"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 msgid "Display"
 msgstr "顯示"
 
-#: src/prefs_common_dialog.c:667
+#: src/prefs_common_dialog.c:670
 msgid "Junk mail"
 msgstr "垃圾郵件"
 
-#: src/prefs_common_dialog.c:673
+#: src/prefs_common_dialog.c:676
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:727
+#: src/prefs_common_dialog.c:730
 msgid "Auto-check new mail"
 msgstr "自動檢查新郵件"
 
-#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:732 src/prefs_common_dialog.c:1073
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:744 src/prefs_common_dialog.c:1087
 msgid "minute(s)"
 msgstr "分鐘"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Check new mail on startup"
 msgstr "開啟時檢查新郵件"
 
-#: src/prefs_common_dialog.c:752
+#: src/prefs_common_dialog.c:755
 msgid "Update all local folders after incorporation"
 msgstr "收信後更新所有資料夾"
 
-#: src/prefs_common_dialog.c:757
+#: src/prefs_common_dialog.c:760
 msgid "Execute command when new messages arrived"
 msgstr "收到新郵件時立即執行"
 
-#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:772 src/prefs_common_dialog.c:2360
+#: src/prefs_common_dialog.c:2382
 msgid "Command"
 msgstr "命令列"
 
-#: src/prefs_common_dialog.c:780
+#: src/prefs_common_dialog.c:783
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "「%d」將會被新郵件的數量所替換。"
 
-#: src/prefs_common_dialog.c:784
+#: src/prefs_common_dialog.c:787
 msgid "Incorporate from local spool"
 msgstr "從本機 spool 取得郵件"
 
-#: src/prefs_common_dialog.c:797
+#: src/prefs_common_dialog.c:800
 msgid "Filter on incorporation"
 msgstr "收信時過濾"
 
-#: src/prefs_common_dialog.c:803
+#: src/prefs_common_dialog.c:806
 msgid "Spool path"
 msgstr "Spool 路徑"
 
-#: src/prefs_common_dialog.c:851
+#: src/prefs_common_dialog.c:854
 msgid "Save sent messages to outbox"
 msgstr "將已送出之郵件存到寄件夾"
 
-#: src/prefs_common_dialog.c:853
+#: src/prefs_common_dialog.c:856
 msgid "Apply filter rules to sent messages"
 msgstr "套用過濾器規則於寄出的郵件"
 
-#: src/prefs_common_dialog.c:860
+#: src/prefs_common_dialog.c:863
 msgid "Transfer encoding"
 msgstr "傳送之編碼"
 
-#: src/prefs_common_dialog.c:885
+#: src/prefs_common_dialog.c:888
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
 
-#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:953 src/prefs_common_dialog.c:1341
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_common_dialog.c:965
+#: src/prefs_common_dialog.c:968
 msgid "Signature separator"
 msgstr "簽章分隔符號"
 
-#: src/prefs_common_dialog.c:974
+#: src/prefs_common_dialog.c:977
 msgid "Insert automatically"
 msgstr "自動加入簽章"
 
-#: src/prefs_common_dialog.c:984
+#: src/prefs_common_dialog.c:987
 msgid "Automatically select account for replies"
 msgstr "回信時在相關欄位上自動加入電子郵件信箱"
 
-#: src/prefs_common_dialog.c:986
+#: src/prefs_common_dialog.c:989
 msgid "Quote message when replying"
 msgstr "回信時引用原文"
 
-#: src/prefs_common_dialog.c:988
+#: src/prefs_common_dialog.c:991
 msgid "Reply button invokes mailing list reply"
 msgstr "讀取郵遞論壇郵件時按下「回覆」鈕表示回覆給郵遞論壇"
 
-#: src/prefs_common_dialog.c:999
+#: src/prefs_common_dialog.c:1002
 msgid "Automatically launch the external editor"
 msgstr "自動呼叫外部編輯器"
 
-#: src/prefs_common_dialog.c:1009
+#: src/prefs_common_dialog.c:1012
 msgid "Undo level"
 msgstr "復原紀錄"
 
-#: src/prefs_common_dialog.c:1029
+#: src/prefs_common_dialog.c:1032
 msgid "Wrap messages at"
 msgstr "每列最多"
 
-#: src/prefs_common_dialog.c:1041
+#: src/prefs_common_dialog.c:1044
 msgid "characters"
 msgstr "個字元"
 
-#: src/prefs_common_dialog.c:1051
+#: src/prefs_common_dialog.c:1054
 msgid "Wrap quotation"
 msgstr "折列時顯示符號"
 
-#: src/prefs_common_dialog.c:1057
+#: src/prefs_common_dialog.c:1060
 msgid "Wrap on input"
 msgstr "切割輸入過長的文字列"
 
-#: src/prefs_common_dialog.c:1059
+#: src/prefs_common_dialog.c:1062
 msgid "Wrap before sending"
 msgstr "寄送之前自動折列"
 
-#: src/prefs_common_dialog.c:1068
+#: src/prefs_common_dialog.c:1071
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "儲存至草稿資料夾"
 
-#: src/prefs_common_dialog.c:1093
+#: src/prefs_common_dialog.c:1096
 #, fuzzy
 msgid "Format"
 msgstr "正常"
 
-#: src/prefs_common_dialog.c:1098
+#: src/prefs_common_dialog.c:1101
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1149
+#: src/prefs_common_dialog.c:1152
 msgid "Reply format"
 msgstr "回覆格式"
 
-#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1167 src/prefs_common_dialog.c:1209
 msgid "Quotation mark"
 msgstr "引言符號"
 
 #. forward
-#: src/prefs_common_dialog.c:1191
+#: src/prefs_common_dialog.c:1194
 msgid "Forward format"
 msgstr "轉寄格式"
 
-#: src/prefs_common_dialog.c:1238
+#: src/prefs_common_dialog.c:1241
 msgid " Description of symbols "
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:1267
+#: src/prefs_common_dialog.c:1270
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1279
+#: src/prefs_common_dialog.c:1282
 #, fuzzy
 msgid "Default language:"
 msgstr "預設的收件夾"
 
-#: src/prefs_common_dialog.c:1346
+#: src/prefs_common_dialog.c:1349
 #, fuzzy
 msgid "Text font"
 msgstr "文字"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1358
+#: src/prefs_common_dialog.c:1361
 msgid "Folder View"
 msgstr "資料夾檢視"
 
-#: src/prefs_common_dialog.c:1366
+#: src/prefs_common_dialog.c:1369
 msgid "Display unread number next to folder name"
 msgstr "若有未讀郵件，就顯示在資料夾名稱後面"
 
-#: src/prefs_common_dialog.c:1368
+#: src/prefs_common_dialog.c:1371
 msgid "Display message number columns in the folder view"
 msgstr "在資料夾檢視中顯示郵件編號欄"
 
-#: src/prefs_common_dialog.c:1377
+#: src/prefs_common_dialog.c:1380
 msgid "Abbreviate newsgroups longer than"
 msgstr "新聞群組縮寫長度大於"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "letters"
 msgstr "個字母"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1398
+#: src/prefs_common_dialog.c:1401
 msgid "Summary View"
 msgstr "郵件列表"
 
-#: src/prefs_common_dialog.c:1407
+#: src/prefs_common_dialog.c:1410
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "若發信人是你自己，就在郵件列表的來源中顯示收信人"
 
-#: src/prefs_common_dialog.c:1409
+#: src/prefs_common_dialog.c:1412
 msgid "Expand threads"
 msgstr "自動展開郵件串列"
 
-#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
-#: src/prefs_common_dialog.c:2747
+#: src/prefs_common_dialog.c:1420 src/prefs_common_dialog.c:2720
+#: src/prefs_common_dialog.c:2758
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1438
+#: src/prefs_common_dialog.c:1441
 msgid " Set display item of summary... "
 msgstr "設定郵件列表選項..."
 
-#: src/prefs_common_dialog.c:1444
+#: src/prefs_common_dialog.c:1447
 msgid "Message"
 msgstr "郵件"
 
-#: src/prefs_common_dialog.c:1454
+#: src/prefs_common_dialog.c:1457
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1468
+#: src/prefs_common_dialog.c:1471
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1474
+#: src/prefs_common_dialog.c:1477
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1488
+#: src/prefs_common_dialog.c:1491
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4703,268 +4708,273 @@ msgstr ""
 "若是選用「自動選擇」，系統將自動為您判斷而使用最\n"
 "適合的語區設定。"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1552
 msgid "Enable coloration of message"
 msgstr "郵件中的引言與超連結顯示變色"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1567
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
 
-#: src/prefs_common_dialog.c:1571
+#: src/prefs_common_dialog.c:1574
 msgid "Display header pane above message view"
 msgstr "在顯示郵件欄上方加入標頭資訊"
 
-#: src/prefs_common_dialog.c:1578
+#: src/prefs_common_dialog.c:1581
 msgid "Display short headers on message view"
 msgstr "在郵件預覽中顯示郵件標頭"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid "Render HTML messages as text"
 msgstr "將 HTML 郵件轉為純文字"
 
-#: src/prefs_common_dialog.c:1594
+#: src/prefs_common_dialog.c:1597
 msgid "Display cursor in message view"
 msgstr "在郵件預覽中顯示游標"
 
-#: src/prefs_common_dialog.c:1607
+#: src/prefs_common_dialog.c:1610
 msgid "Line space"
 msgstr "列間距"
 
-#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1624 src/prefs_common_dialog.c:1662
 msgid "pixel(s)"
 msgstr "像素"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1629
 msgid "Scroll"
 msgstr "捲軸"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Half page"
 msgstr "一次半頁"
 
-#: src/prefs_common_dialog.c:1639
+#: src/prefs_common_dialog.c:1642
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_common_dialog.c:1645
+#: src/prefs_common_dialog.c:1648
 msgid "Step"
 msgstr "每次捲動"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Images"
 msgstr "圖片"
 
-#: src/prefs_common_dialog.c:1673
+#: src/prefs_common_dialog.c:1676
 msgid "Resize attached large images to fit in the window"
 msgstr "調整附加圖片大小以適合視窗"
 
-#: src/prefs_common_dialog.c:1675
+#: src/prefs_common_dialog.c:1678
 msgid "Display images as inline"
 msgstr "在列間顯示圖片"
 
-#: src/prefs_common_dialog.c:1759
+#: src/prefs_common_dialog.c:1762
 msgid "Enable Junk mail control"
 msgstr "啟用垃圾郵件控制"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1774
 msgid "Learning command:"
 msgstr "正在學習命令:"
 
-#: src/prefs_common_dialog.c:1780
+#: src/prefs_common_dialog.c:1783
 #, fuzzy
 msgid "(Select preset)"
 msgstr "選擇金鑰"
 
-#: src/prefs_common_dialog.c:1805
+#: src/prefs_common_dialog.c:1808
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
-#: src/prefs_common_dialog.c:1820
+#: src/prefs_common_dialog.c:1823
 msgid "Classifying command"
 msgstr "正在歸類命令"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1834
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1841
+#: src/prefs_common_dialog.c:1844
 msgid "Junk folder"
 msgstr "垃圾郵件資料夾"
 
-#: src/prefs_common_dialog.c:1859
+#: src/prefs_common_dialog.c:1862
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "被歸類為垃圾郵件者將會被移到這個資料夾。"
 
-#: src/prefs_common_dialog.c:1870
+#: src/prefs_common_dialog.c:1873
 msgid "Filter messages classified as junk on receiving"
 msgstr "接收郵件時對歸類為垃圾郵件者進行過濾"
 
-#: src/prefs_common_dialog.c:1873
+#: src/prefs_common_dialog.c:1876
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_common_dialog.c:1877
+#: src/prefs_common_dialog.c:1880
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1918
+#: src/prefs_common_dialog.c:1921
 msgid "Automatically check signatures"
 msgstr "自動檢查數位簽章"
 
-#: src/prefs_common_dialog.c:1921
+#: src/prefs_common_dialog.c:1924
 msgid "Show signature check result in a popup window"
 msgstr "將數位簽章檢查結果顯示在另一視窗"
 
-#: src/prefs_common_dialog.c:1924
+#: src/prefs_common_dialog.c:1927
 msgid "Store passphrase in memory temporarily"
 msgstr "將密碼片語暫時存在記憶體中"
 
-#: src/prefs_common_dialog.c:1939
+#: src/prefs_common_dialog.c:1942
 msgid "Expired after"
 msgstr "期限："
 
-#: src/prefs_common_dialog.c:1952
+#: src/prefs_common_dialog.c:1955
 msgid "minute(s) "
 msgstr "分鐘"
 
-#: src/prefs_common_dialog.c:1966
+#: src/prefs_common_dialog.c:1969
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "若設定為「0」則表示儲存密碼片語以供整個工作階段使用。"
 
-#: src/prefs_common_dialog.c:1975
+#: src/prefs_common_dialog.c:1978
 msgid "Grab input while entering a passphrase"
 msgstr "輸入密碼片語時擷取輸入"
 
-#: src/prefs_common_dialog.c:1980
+#: src/prefs_common_dialog.c:1983
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
 
-#: src/prefs_common_dialog.c:2044
+#: src/prefs_common_dialog.c:2048
 msgid "Always open messages in summary when selected"
 msgstr "在郵件列表選擇郵件時開啟郵件"
 
-#: src/prefs_common_dialog.c:2048
+#: src/prefs_common_dialog.c:2052
 msgid "Open first unread message when entering a folder"
 msgstr "進入資料夾時直接跳到第一封未讀郵件"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2056
 msgid "Only mark message as read when opened in new window"
 msgstr "只在開啟新郵件時標示為未讀"
 
-#: src/prefs_common_dialog.c:2056
+#: src/prefs_common_dialog.c:2060
 msgid "Go to inbox after receiving new mail"
 msgstr "接收完新郵件後直接進入收件夾中"
 
-#: src/prefs_common_dialog.c:2064
+#: src/prefs_common_dialog.c:2068
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移動或刪除郵件時立即執行"
 
-#: src/prefs_common_dialog.c:2076
+#: src/prefs_common_dialog.c:2080
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "若此選項關閉，則必須按下「執行」才會執行移動或刪除。"
 
-#: src/prefs_common_dialog.c:2081
+#: src/prefs_common_dialog.c:2089
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "讓按鈕的順序相容於 GNOME HIG"
 
-#: src/prefs_common_dialog.c:2088
+#: src/prefs_common_dialog.c:2091
+#, fuzzy
+msgid "Display tray icon"
+msgstr "顯示名稱"
+
+#: src/prefs_common_dialog.c:2098
 msgid " Set key bindings... "
 msgstr "設定熱鍵..."
 
-#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2104 src/select-keys.c:344
 msgid "Other"
 msgstr "其他"
 
-#: src/prefs_common_dialog.c:2098
+#: src/prefs_common_dialog.c:2108
 #, fuzzy
 msgid "External commands"
 msgstr "執行命令"
 
-#: src/prefs_common_dialog.c:2146
+#: src/prefs_common_dialog.c:2157
 msgid "Receive dialog"
 msgstr "接收進度對話框"
 
-#: src/prefs_common_dialog.c:2156
+#: src/prefs_common_dialog.c:2167
 msgid "Show receive dialog"
 msgstr "顯示接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2166
+#: src/prefs_common_dialog.c:2177
 msgid "Always"
 msgstr "一律顯示"
 
-#: src/prefs_common_dialog.c:2167
+#: src/prefs_common_dialog.c:2178
 msgid "Only on manual receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_common_dialog.c:2169
+#: src/prefs_common_dialog.c:2180
 msgid "Never"
 msgstr "不顯示"
 
-#: src/prefs_common_dialog.c:2174
+#: src/prefs_common_dialog.c:2185
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不要開啟錯誤視窗。"
 
-#: src/prefs_common_dialog.c:2177
+#: src/prefs_common_dialog.c:2188
 msgid "Close receive dialog when finished"
 msgstr "完成時關閉接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2188
+#: src/prefs_common_dialog.c:2199
 msgid "Add address to destination when double-clicked"
 msgstr "在通訊錄中，可利用雙擊直接將該電子郵件加入收信人中"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2201
 msgid "On exit"
 msgstr "離開設定"
 
-#: src/prefs_common_dialog.c:2198
+#: src/prefs_common_dialog.c:2209
 msgid "Confirm on exit"
 msgstr "離開時確認"
 
-#: src/prefs_common_dialog.c:2205
+#: src/prefs_common_dialog.c:2216
 msgid "Empty trash on exit"
 msgstr "離開時清空刪除的郵件"
 
-#: src/prefs_common_dialog.c:2207
+#: src/prefs_common_dialog.c:2218
 msgid "Ask before emptying"
 msgstr "清除時確認"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2222
 msgid "Warn if there are queued messages"
 msgstr "離開時若有尚未送出之郵件即發出警告"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2274
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 
-#: src/prefs_common_dialog.c:2272
+#: src/prefs_common_dialog.c:2283
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
-#: src/prefs_common_dialog.c:3792
+#: src/prefs_common_dialog.c:2295 src/prefs_common_dialog.c:3782
+#: src/prefs_common_dialog.c:3803
 msgid "(Default browser)"
 msgstr "(預設的瀏覽器)"
 
-#: src/prefs_common_dialog.c:2337
+#: src/prefs_common_dialog.c:2348
 msgid "Use external program for incorporation"
 msgstr "用其他外部程式來收信"
 
-#: src/prefs_common_dialog.c:2359
+#: src/prefs_common_dialog.c:2370
 msgid "Use external program for sending"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common_dialog.c:2417
+#: src/prefs_common_dialog.c:2428
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "啟用對於郵件列表快取整合性的嚴格檢查"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2431
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -4973,264 +4983,264 @@ msgstr ""
 "如果資料夾的內容有被其他應用軟體更動過的可能，就開啟它。\n"
 "此一選項將會降低郵件列表的顯示效能。"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2438
 msgid "Socket I/O timeout:"
 msgstr "插槽 I/O 等待時間："
 
-#: src/prefs_common_dialog.c:2440
+#: src/prefs_common_dialog.c:2451
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2468
+#: src/prefs_common_dialog.c:2479
 msgid "Automatic (Recommended)"
 msgstr "自動選擇（推薦使用）"
 
-#: src/prefs_common_dialog.c:2473
+#: src/prefs_common_dialog.c:2484
 msgid "7bit ascii (US-ASCII)"
 msgstr "七位元 ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2475
+#: src/prefs_common_dialog.c:2486
 msgid "Unicode (UTF-8)"
 msgstr "統一碼 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2477
+#: src/prefs_common_dialog.c:2488
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2478
+#: src/prefs_common_dialog.c:2489
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2480
+#: src/prefs_common_dialog.c:2491
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2484
+#: src/prefs_common_dialog.c:2495
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2486
+#: src/prefs_common_dialog.c:2497
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2487
+#: src/prefs_common_dialog.c:2498
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2489
+#: src/prefs_common_dialog.c:2500
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2491
+#: src/prefs_common_dialog.c:2502
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2492
+#: src/prefs_common_dialog.c:2503
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯來語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2494
+#: src/prefs_common_dialog.c:2505
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2496
+#: src/prefs_common_dialog.c:2507
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2508
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2498
+#: src/prefs_common_dialog.c:2509
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2499
+#: src/prefs_common_dialog.c:2510
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2501
+#: src/prefs_common_dialog.c:2512
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2503
+#: src/prefs_common_dialog.c:2514
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:2515
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2518
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2508
+#: src/prefs_common_dialog.c:2519
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2520
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2522
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2523
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2515
+#: src/prefs_common_dialog.c:2526
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2517
+#: src/prefs_common_dialog.c:2528
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2529
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2685
+#: src/prefs_common_dialog.c:2696
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common_dialog.c:2686
+#: src/prefs_common_dialog.c:2697
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common_dialog.c:2687
+#: src/prefs_common_dialog.c:2698
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common_dialog.c:2688
+#: src/prefs_common_dialog.c:2699
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common_dialog.c:2689
+#: src/prefs_common_dialog.c:2700
 msgid "the preferred date and time for the current locale"
 msgstr "目前語區設定所偏好的日期與時間"
 
-#: src/prefs_common_dialog.c:2690
+#: src/prefs_common_dialog.c:2701
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common_dialog.c:2691
+#: src/prefs_common_dialog.c:2702
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2692
+#: src/prefs_common_dialog.c:2703
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2693
+#: src/prefs_common_dialog.c:2704
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2694
+#: src/prefs_common_dialog.c:2705
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2695
+#: src/prefs_common_dialog.c:2706
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2696
+#: src/prefs_common_dialog.c:2707
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2697
+#: src/prefs_common_dialog.c:2708
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common_dialog.c:2698
+#: src/prefs_common_dialog.c:2709
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2699
+#: src/prefs_common_dialog.c:2710
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2711
 msgid "the preferred date for the current locale"
 msgstr "目前語區設定所偏好的日期"
 
-#: src/prefs_common_dialog.c:2701
+#: src/prefs_common_dialog.c:2712
 msgid "the last two digits of a year"
 msgstr "公元年份的後兩位數字"
 
-#: src/prefs_common_dialog.c:2702
+#: src/prefs_common_dialog.c:2713
 msgid "the year as a decimal number"
 msgstr "公元年份 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2714
 msgid "the time zone or name or abbreviation"
 msgstr "時區名稱或縮寫"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2735
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2736
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2765
+#: src/prefs_common_dialog.c:2776
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common_dialog.c:2846
+#: src/prefs_common_dialog.c:2857
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common_dialog.c:2854
+#: src/prefs_common_dialog.c:2865
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common_dialog.c:2888
+#: src/prefs_common_dialog.c:2899
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common_dialog.c:2894
+#: src/prefs_common_dialog.c:2905
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common_dialog.c:2900
+#: src/prefs_common_dialog.c:2911
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common_dialog.c:2906
+#: src/prefs_common_dialog.c:2917
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common_dialog.c:2913
+#: src/prefs_common_dialog.c:2924
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2991
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2994
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2997
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:3000
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common_dialog.c:3129
+#: src/prefs_common_dialog.c:3140
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:3185
+#: src/prefs_common_dialog.c:3196
 msgid ""
 "Date\n"
 "From\n"
@@ -5254,11 +5264,11 @@ msgstr ""
 "新聞群組\n"
 "郵件識別碼"
 
-#: src/prefs_common_dialog.c:3198
+#: src/prefs_common_dialog.c:3209
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示正規表示式"
 
-#: src/prefs_common_dialog.c:3202
+#: src/prefs_common_dialog.c:3213
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5272,7 +5282,7 @@ msgstr ""
 "引言（不含簽章）\n"
 "% 符號"
 
-#: src/prefs_common_dialog.c:3210
+#: src/prefs_common_dialog.c:3221
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5284,19 +5294,19 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common_dialog.c:3256
+#: src/prefs_common_dialog.c:3267
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common_dialog.c:3269
+#: src/prefs_common_dialog.c:3280
 msgid "Select the preset of key bindings."
 msgstr "選擇事先設定的按鍵組合。"
 
-#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3290 src/prefs_common_dialog.c:3614
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3293 src/prefs_common_dialog.c:3623
 msgid "Old Sylpheed"
 msgstr "舊設定"
 
@@ -5624,19 +5634,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4568
+#: src/summaryview.c:4569
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4571
+#: src/summaryview.c:4572
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4573
+#: src/summaryview.c:4574
 msgid "Date"
 msgstr "日期"
 
@@ -6305,97 +6315,97 @@ msgstr "\t產生郵件列表中..."
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2194
+#: src/summaryview.c:2195
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2526
+#: src/summaryview.c:2527
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2585
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2673
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:2733
+#: src/summaryview.c:2734
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:2751
+#: src/summaryview.c:2752
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:2752
+#: src/summaryview.c:2753
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:2817
+#: src/summaryview.c:2818
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:2855
+#: src/summaryview.c:2856
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:2913
+#: src/summaryview.c:2914
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:2930
+#: src/summaryview.c:2931
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:2986
+#: src/summaryview.c:2987
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3003
+#: src/summaryview.c:3004
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3202
+#: src/summaryview.c:3203
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3503 src/summaryview.c:3504
+#: src/summaryview.c:3504 src/summaryview.c:3505
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:3646 src/summaryview.c:3647
+#: src/summaryview.c:3647 src/summaryview.c:3648
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:3926 src/summaryview.c:3982
+#: src/summaryview.c:3927 src/summaryview.c:3983
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4031
+#: src/summaryview.c:4032
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4032
+#: src/summaryview.c:4033
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4068
+#: src/summaryview.c:4069
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4577
+#: src/summaryview.c:4578
 msgid "No."
 msgstr "No."
 
@@ -6416,7 +6426,7 @@ msgstr "無法顯示郵件。\n"
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:1933
+#: src/textview.c:1933 src/trayicon.c:109
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
@@ -6452,6 +6462,31 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"
 
+#: src/trayicon.c:95
+#, fuzzy
+msgid "Get from _current account"
+msgstr "/郵件(_M)/接收(_V)/從目前帳號中接收新郵件(_C)"
+
+#: src/trayicon.c:99
+#, fuzzy
+msgid "Get from _all accounts"
+msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
+
+#: src/trayicon.c:103
+#, fuzzy
+msgid "_Send queued messages"
+msgstr "將暫存資料夾中的郵件送出"
+
+#: src/trayicon.c:114
+#, fuzzy
+msgid "_About"
+msgstr "關於"
+
+#: src/trayicon.c:117
+#, fuzzy
+msgid "E_xit"
+msgstr "離開"
+
 #, fuzzy
 #~ msgid "%s - Search folder properties"
 #~ msgstr "資料夾屬性"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-01-13 09:20:58 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-01-13 09:20:58 +0000
commit	f4ef5b2fe53d60d2d9bd4ed4f3c0b3f9c7be53bb (patch)
tree	5a62bfb178c4455df4f262655e6031d70b35a788 /po
parent	80072d1ee0161c430f44b40ad52d3038a039d364 (diff)