added '--exit' command line option.

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

28 files changed, 2295 insertions, 2156 deletions

diff --git a/po/bg.po b/po/bg.po
index 7c21d30d..3d242266 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -324,7 +324,7 @@ msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr ""
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1204,11 +1204,11 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -1732,7 +1732,7 @@ msgstr "MIME тип"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Изпращане"
@@ -2326,12 +2326,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2581,7 +2581,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Следващ"
 
@@ -2813,20 +2813,20 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не се поддържа от glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2836,23 +2836,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2860,30 +2860,35 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                режим на дебъг"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2897,20 +2902,20 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2919,16 +2924,16 @@ msgstr ""
 "OpenPGP поддръжката е отменена."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3550,34 +3555,34 @@ msgstr "Неозаглавен"
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3588,16 +3593,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3606,153 +3611,153 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
diff --git a/po/cs.po b/po/cs.po
index fe634462..20fd9bdb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -327,7 +327,7 @@ msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Poslední počet v adresáři %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1205,11 +1205,11 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Varování"
 
@@ -1733,7 +1733,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Odeslat"
@@ -2328,12 +2328,12 @@ msgstr "Nastavuji informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
@@ -2584,7 +2584,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Další"
 
@@ -2817,20 +2817,20 @@ msgstr "Zadejte heslo"
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otevře okno pro psaní nové zprávy"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2840,53 +2840,58 @@ msgstr ""
 "                           otevře okno pro psaní zprávy s připojeným\n"
 "                           souborem(y)"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive             načte nové zprávy"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          načte všechny nové zprávy ze všech účtů"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send              pošle všechny pozdržené zprávy"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug              režim trasování"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug              režim trasování"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help            vypíše tento text a skončí"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version             vypíše informace o verzi a skončí"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupní znaková sada"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2900,19 +2905,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Právě se vytváří zpráva. Opravdu skončit?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2921,16 +2926,16 @@ msgstr ""
 "Podpora pro OpenPGP je zakázána."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavení akcí"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3553,34 +3558,34 @@ msgstr "Neoznačený"
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3591,16 +3596,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3610,153 +3615,153 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavit jako výchozí"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
diff --git a/po/da.po b/po/da.po
index e5c63891..a20670fd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -326,7 +326,7 @@ msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Sidste nummer i sti %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1202,11 +1202,11 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -1730,7 +1730,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Send"
@@ -2324,12 +2324,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2580,7 +2580,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Næste"
 
@@ -2817,20 +2817,20 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread er ikke understøttet i glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2840,23 +2840,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2864,29 +2864,34 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                debug mode"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2900,19 +2905,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2921,16 +2926,16 @@ msgstr ""
 "OpenPGP ikke mulig."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3553,34 +3558,34 @@ msgstr "Uden titel"
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3591,16 +3596,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3609,153 +3614,153 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Standard konto"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
diff --git a/po/de.po b/po/de.po
index f1a73102..9e0a84e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2005-07-22 18:18+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -325,7 +325,7 @@ msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1003,7 +1003,7 @@ msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1209,11 +1209,11 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Warnung"
 
@@ -1704,7 +1704,7 @@ msgstr "MIME-Typ"
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Senden"
@@ -2290,12 +2290,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2548,7 +2548,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Nächste"
 
@@ -2778,20 +2778,20 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird nicht unterstützt von Glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2801,23 +2801,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2825,28 +2825,33 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                Fehlersuche"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Dateiname Zeichensatz"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2870,19 +2875,19 @@ msgstr ""
 "\n"
 "Weiter?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2891,15 +2896,15 @@ msgstr ""
 "OpenPGP-Unterstützung ausgeschaltet"
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3495,33 +3500,33 @@ msgstr "Unbenannt"
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3532,16 +3537,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3550,149 +3555,149 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Markiere als Spam Mail"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 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:2538
+#: src/mainwindow.c:2541
 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:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
diff --git a/po/el.po b/po/el.po
index fdb2880b..53033624 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -328,7 +328,7 @@ msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1212,11 +1212,11 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -1751,7 +1751,7 @@ msgstr "τύπος MIME"
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Αποστολή"
@@ -2366,12 +2366,12 @@ msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
@@ -2637,7 +2637,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2870,74 +2870,79 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:367
+#: src/main.c:370
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                debug mode"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Κωδικοσελίδα εξερχομένων"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2951,19 +2956,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει παράθυρο σύνθεσης μηνύματος. Να κλείσω;"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:640
+#: src/main.c:658
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2973,16 +2978,16 @@ msgstr ""
 "Απενεργοποιείται η υποστήριξη OpenPGP."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "ένα άλλο Sylpheed τρέχει ήδη.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Γράφω τις ρυθμίσεις των φίλτρων...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3676,34 +3681,34 @@ msgstr "Χωρίς τίτλο"
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3714,16 +3719,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3732,160 +3737,160 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
diff --git a/po/es.po b/po/es.po
index e12f0684..555b755e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -323,7 +323,7 @@ msgstr "Copiando mensaje %s%c%d a %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1206,11 +1206,11 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1703,7 +1703,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Enviar"
@@ -2290,12 +2290,12 @@ msgstr "Estableciendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2547,7 +2547,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2777,20 +2777,20 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2800,23 +2800,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2824,28 +2824,33 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                modo de depuración"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2869,19 +2874,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2890,15 +2895,15 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed ejecutándose.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3494,33 +3499,33 @@ msgstr "Sin título"
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3531,16 +3536,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3550,149 +3555,149 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Basura"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Es correo basura"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
diff --git a/po/et.po b/po/et.po
index 286eb96e..516330a0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -329,7 +329,7 @@ msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Viimane number kataloogis %s on %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1209,11 +1209,11 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -1738,7 +1738,7 @@ msgstr "MIME tüüp"
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Saada"
@@ -2334,12 +2334,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2592,7 +2592,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2821,20 +2821,20 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ei ole glib poolt toetatud.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2844,53 +2844,58 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                veaotsimise režiim"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2904,19 +2909,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2925,16 +2930,16 @@ msgstr ""
 "OpenPGP toetus keelustatud."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3558,34 +3563,34 @@ msgstr "Tiitlita"
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3595,16 +3600,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3613,153 +3618,153 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
diff --git a/po/fr.po b/po/fr.po
index 393edf0e..69129908 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -331,7 +331,7 @@ msgstr "Copie du message %s%c%d vers %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Dernier numéro dans le répertoire %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1220,11 +1220,11 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -1717,7 +1717,7 @@ msgstr "Type MIME"
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Envoyer"
@@ -2307,12 +2307,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2565,7 +2565,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:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Suivant"
 
@@ -2795,20 +2795,20 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2819,24 +2819,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2844,28 +2844,33 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                afficher les informations de mise au point"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2889,23 +2894,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2914,15 +2919,15 @@ msgstr ""
 "Support OpenPGP désactivé."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3521,33 +3526,33 @@ msgstr "Sans titre"
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3557,16 +3562,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:1600 src/setup.c:49
+#: src/mainwindow.c:1603 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:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3576,149 +3581,149 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Marquer comme indésirable"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 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:2538
+#: src/mainwindow.c:2541
 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:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
diff --git a/po/gl.po b/po/gl.po
index b4ca5bea..e765a408 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -328,7 +328,7 @@ msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número en directorio %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1208,11 +1208,11 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1737,7 +1737,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Enviar"
@@ -2332,12 +2332,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2588,7 +2588,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2821,20 +2821,20 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non está soportado por glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2844,53 +2844,58 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                modo de depuración"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2904,19 +2909,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2925,16 +2930,16 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3557,34 +3562,34 @@ msgstr "Sen título"
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3595,16 +3600,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3614,153 +3619,153 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "conta por defecto"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
diff --git a/po/hr.po b/po/hr.po
index f67edc70..b5f2b190 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -330,7 +330,7 @@ msgstr "Kopiram poruke %s%c%d u %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Posljednji broj u direktoriju %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1206,11 +1206,11 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Upozorenje"
 
@@ -1745,7 +1745,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Pošalji"
@@ -2346,12 +2346,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2616,7 +2616,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2851,74 +2851,79 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nije podržan od glib-a.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:367
+#: src/main.c:370
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                debug način"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2932,19 +2937,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:640
+#: src/main.c:658
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2954,16 +2959,16 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3654,34 +3659,34 @@ msgstr "Neimenovano"
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3692,16 +3697,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3710,156 +3715,156 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
diff --git a/po/hu.po b/po/hu.po
index 29cdda0d..217303ec 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: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2005-07-04 17:05+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -324,7 +324,7 @@ msgstr "%s%c%d üzenet másolása %s-ba ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Az utolsó szám a(z) %s mappában = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1005,7 +1005,7 @@ msgstr "Név:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1206,11 +1206,11 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -1702,7 +1702,7 @@ msgstr "MIME típus"
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Küldés"
@@ -2288,12 +2288,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2545,7 +2545,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Következő"
 
@@ -2775,20 +2775,20 @@ msgstr "Adja meg a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread-et a glib nem támogatja.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2798,23 +2798,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új üzenetek vétele"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új üzenetek vétele minden hozzáférésről"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...  üzenetek számának kijelzése"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2822,28 +2822,33 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       az összes mappa státuszának kijelzése"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                hibakereső üzemmód"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Fájlnév karakterkódolása"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2867,19 +2872,19 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Üzenet szerkesztés alatt. Tényleg kilép?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Várakozó üzenetek"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen üzenetek. Kilépés most?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2888,15 +2893,15 @@ msgstr ""
 "OpenPGP támogatás kikapcsolva."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3492,33 +3497,33 @@ msgstr "Névtelen"
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3529,16 +3534,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3547,150 +3552,150 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Új levelek fogadása"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Fogadás mindről"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Új levelek fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Levélszemétként beállítás"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 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:2538
+#: src/mainwindow.c:2541
 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:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
diff --git a/po/it.po b/po/it.po
index e985bd89..b591daa5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2005-09-17 10:24+0200\n"
 "Last-Translator: danilo bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -324,7 +324,7 @@ msgstr "Copia del messaggio %s%c%d in %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimo numero nella cartella %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1004,7 +1004,7 @@ msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
-#: src/editaddress.c:1017 src/mainwindow.c:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1210,11 +1210,11 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Avvertimento"
 
@@ -1709,7 +1709,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Invia"
@@ -2297,12 +2297,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2554,7 +2554,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Successivo"
 
@@ -2783,20 +2783,20 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non è supportato da glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2806,23 +2806,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2830,28 +2830,33 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                modalità di debug"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Codifica nome file"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2875,19 +2880,19 @@ msgstr ""
 "\n"
 "Continuo?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2896,15 +2901,15 @@ msgstr ""
 "Il supporto per OpenPGP è disabilitato."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3499,32 +3504,32 @@ msgstr "Senza titolo"
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3535,16 +3540,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3554,149 +3559,149 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Imposta come mail spazzatura"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
diff --git a/po/ja.po b/po/ja.po
index 0646c457..ac3e7c4c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -322,7 +322,7 @@ msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1203,11 +1203,11 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "警告"
 
@@ -1698,7 +1698,7 @@ msgstr "MIME タイプ"
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "送信"
@@ -2282,12 +2282,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2538,7 +2538,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "次へ"
 
@@ -2767,20 +2767,20 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread は glib によってサポートされていません。\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用法: %s [オプション]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    メッセージ作成ウィンドウを開く"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2790,23 +2790,23 @@ msgstr ""
 "                         指定したファイルを添付してメッセージ作成\n"
 "                         ウィンドウを開く"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              新着メッセージを受信する"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          全アカウントの新着メッセージを受信する"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送信待機中のメッセージをすべて送信する"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   メッセージの総数を表示する"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2814,28 +2814,32 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         各フォルダの状態を表示する"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir dirname    設定ファイルを格納するディレクトリを指定する"
 
-#: src/main.c:372
+#: src/main.c:375
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --exit                 Sylpheed を終了する"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                デバッグモード"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 このヘルプを表示して終了する"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              バージョン情報を出力して終了する"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "ファイル名エンコーディング"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2858,19 +2862,19 @@ msgstr ""
 "\n"
 "続行しますか?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "作成中のメッセージが存在します。本当に終了しますか?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "送信待機中のメッセージ"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2879,15 +2883,15 @@ msgstr ""
 "OpenPGP サポートは無効です。"
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3484,32 +3488,32 @@ msgstr "名称未設定"
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3518,16 +3522,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3536,149 +3540,149 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "新規メッセージを作成"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "迷惑メールに指定"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
diff --git a/po/ko.po b/po/ko.po
index 892284fd..c20551ca 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -329,7 +329,7 @@ msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1192,11 +1192,11 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "경고"
 
@@ -1720,7 +1720,7 @@ msgstr "마임 타입"
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "메일 발송"
@@ -2315,12 +2315,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2571,7 +2571,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "다음"
 
@@ -2797,20 +2797,20 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2820,53 +2820,58 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                디버깅 모드"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2880,19 +2885,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2901,16 +2906,16 @@ msgstr ""
 "OpenPGP 지원기능을 끕니다."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3534,34 +3539,34 @@ msgstr "제목 없슴"
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3572,16 +3577,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3590,153 +3595,153 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
diff --git a/po/lt.po b/po/lt.po
index cbb03540..ad243c74 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -323,7 +323,7 @@ msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Paskutinis numeris kataloge %s - %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1200,11 +1200,11 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -1695,7 +1695,7 @@ msgstr "MIME tipas"
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Siųsti"
@@ -2281,12 +2281,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -2538,7 +2538,7 @@ msgstr "Importuioti LDIF bylą į adresų knygą"
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Kitas"
 
@@ -2768,20 +2768,20 @@ msgstr "Įveskite slaptažodį"
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepalaiko g_thread.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Naudojimas: %s [PARAMETRAI]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    atverti rašymo langą"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2791,23 +2791,23 @@ msgstr ""
 "                         atverti rašymo langą su prisegtomis\n"
 "                         nurodytomis bylomis"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              gauti naujas žinutes"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          gauti naujas žinutes iš visų sąskaitų"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 siųsti žinutes eilėje"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalogas]... rodyti bendrą žinučių skaičių"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2815,28 +2815,33 @@ msgstr ""
 "  --status-full [katalogas]...\n"
 "                         rodyti kiekvieno katalogo būseną"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                derinimo rėžimas"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                derinimo rėžimas"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 rodyti šią pagalbą ir baigti"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              išvesti versiją ir baigti"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Bylų vardų koduotė"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2860,19 +2865,19 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Rašoma žinutė. Tikrai išeiti?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Žinutės eilėje"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų žinučių. Išeiti dabar?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2881,15 +2886,15 @@ msgstr ""
 "OpenPGP palaikymas išjungtas."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3485,33 +3490,33 @@ msgstr "Bevardis"
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3522,16 +3527,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskanuota automatiškai."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3540,149 +3545,149 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurios bylos jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Gauti"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Prijungti naują paštą"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Gauti visus"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijungti naują visų sąskaitų paštą"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Rašyti naują laišką"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Atsakyti į laišką"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Atsakyti visus"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Atsakyti į visus"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Persiųsti laišką"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Ištrinti laišką"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Sąskaitos nustatymai"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
diff --git a/po/nl.po b/po/nl.po
index 8a8ab587..1d3e9ae7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -332,7 +332,7 @@ msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Laatste nummer in map %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1218,11 +1218,11 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -1746,7 +1746,7 @@ msgstr "MIME type"
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Verzenden"
@@ -2342,12 +2342,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2599,7 +2599,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Volgende"
 
@@ -2826,20 +2826,20 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread is niet ondersteunt door glib\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2849,53 +2849,58 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespacificeerde bestanden als bijvoegingen"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                debug modus"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codering voor uitgaande berichten"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2909,21 +2914,21 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2932,16 +2937,16 @@ msgstr ""
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Bezig met wegschrijven van configuratie van acties...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3564,34 +3569,34 @@ msgstr "Geen titel"
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3602,16 +3607,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3621,153 +3626,153 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Instellen als standaard"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
diff --git a/po/pl.po b/po/pl.po
index b4469ffe..9ed5d945 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -322,7 +322,7 @@ msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Ostatni numer w katalogu %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1205,11 +1205,11 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -1698,7 +1698,7 @@ msgstr "typ MIME"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Wyślij"
@@ -2289,12 +2289,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2544,7 +2544,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Następna"
 
@@ -2774,20 +2774,20 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2797,23 +2797,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2821,30 +2821,35 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                tryb debugowania"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Kodowanie wyjściowe"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2858,19 +2863,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2879,15 +2884,15 @@ msgstr ""
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3486,33 +3491,33 @@ msgstr "Bez tytułu"
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3523,16 +3528,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3542,150 +3547,150 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 66eb0994..e33deff3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2005-10-26 16:53-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -325,7 +325,7 @@ msgstr "Copiando mensagem %s%c%d para %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número no diretório %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1206,11 +1206,11 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1702,7 +1702,7 @@ msgstr "Tipo MIME"
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Enviar"
@@ -2290,12 +2290,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2547,7 +2547,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Próxima"
 
@@ -2776,20 +2776,20 @@ msgstr "Informe a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportada pela glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2799,23 +2799,23 @@ msgstr ""
 "                         abrir a janela de composição com os arquivos\n"
 "                         especificados anexados"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...   mostra o número total de mensagens"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2823,30 +2823,35 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         exibe o status de cada pasta"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir diretório    especifica o diretório que armazena os arquivos "
 "de configuração"
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                modo debug"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Codificação de nome de arquivo"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2870,19 +2875,19 @@ msgstr ""
 "\n"
 "Continuar?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Deseja sair?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Algumas mensagens não enviadas estão na fila. Sair agora?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2891,15 +2896,15 @@ msgstr ""
 "Suporte a OpenPGP desabilitado."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3494,32 +3499,32 @@ msgstr "Sem título"
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3529,16 +3534,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3548,149 +3553,149 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Spam"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Marcar como spam"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
diff --git a/po/ro.po b/po/ro.po
index 12cb4903..ebbf8b33 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -329,7 +329,7 @@ msgstr "Copiere mesaj %s%c%d în %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Ultimul număr din directorul %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1227,11 +1227,11 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Informaţie"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Avertisment"
 
@@ -1761,7 +1761,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Trimitere"
@@ -2367,12 +2367,12 @@ msgstr "Setare informaţii despre director...\n"
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
@@ -2627,7 +2627,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Înainte"
 
@@ -2860,75 +2860,80 @@ msgstr "Introducere parolă"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nu este suportat de glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPŢIUNE]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresă]    deschidere fereastră de compunere"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recepţionare mesaje noi"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          recepţionare mesaje noi pentru toate conturile"
 
-#: src/main.c:367
+#: src/main.c:370
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                mod debug"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afişare ajutor şi ieşire"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              afişare versiune şi ieşire"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Set de caractere"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2942,21 +2947,21 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Fereastra de compunere de mesaje există.\n"
 "Sunteţi sigur că doriţi sa ieşiţi ?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Mesaje în lista de aşteptare"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Exista mesaje netrimise în lista de aşteptare. Doriţi sa ieşiţi ?"
 
-#: src/main.c:640
+#: src/main.c:658
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2966,16 +2971,16 @@ msgstr ""
 "Suportul pentru OpenPGP a fost dezactivat."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează o alta sesiune Sylpheed.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Scriere configuraţia filtrului...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3680,34 +3685,34 @@ msgstr "Neintitulat"
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3718,16 +3723,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3737,155 +3742,155 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr ""
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
diff --git a/po/ru.po b/po/ru.po
index 4b1e8c9c..9e473ff6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -327,7 +327,7 @@ msgstr "Копирование сообщения %s%c%d в %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Последний номер в каталоге %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1207,11 +1207,11 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -1727,7 +1727,7 @@ msgstr "Тип MIME"
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Отправить"
@@ -2320,12 +2320,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2575,7 +2575,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Далее"
 
@@ -2805,20 +2805,20 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не поддерживается в glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно подготовки сообщения"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2828,24 +2828,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединенными\n"
 "                         файлами"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учетных записей"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2853,29 +2853,34 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                режим отладки"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Кодировка отправляемых сообщений"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2889,19 +2894,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть непосланные сообщения. Выходить?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2910,16 +2915,16 @@ msgstr ""
 "Поддержка OpenPGP отключена."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Настройка действий"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3525,33 +3530,33 @@ msgstr "Без названия"
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3562,16 +3567,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3581,151 +3586,151 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "По умолчанию"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
diff --git a/po/sk.po b/po/sk.po
index ab2c0127..d8778ae1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -326,7 +326,7 @@ msgstr "Kopírujem správu %s%c%d do %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Posledné číslo v priečinku %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1206,11 +1206,11 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -1734,7 +1734,7 @@ msgstr "MIME typ"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Odoslať"
@@ -2330,12 +2330,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2585,7 +2585,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2817,20 +2817,20 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2841,23 +2841,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2865,30 +2865,35 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                ladiaci mód"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2902,19 +2907,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2923,16 +2928,16 @@ msgstr ""
 "Podpora OpenPGP je vypnutá."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3548,34 +3553,34 @@ msgstr "Bez názvu"
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3586,16 +3591,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3605,153 +3610,153 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
diff --git a/po/sl.po b/po/sl.po
index 83e64b85..7e5bfa83 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -329,7 +329,7 @@ msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Zadnja številka v imeniku %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1211,11 +1211,11 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -1739,7 +1739,7 @@ msgstr "Tip MIME"
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Pošlji"
@@ -2334,12 +2334,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2590,7 +2590,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2817,20 +2817,20 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ni podprt v glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2840,53 +2840,58 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                razhroščevalni način"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2900,19 +2905,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2921,16 +2926,16 @@ msgstr ""
 "Podpora za OpenPGP je izključena."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3553,34 +3558,34 @@ msgstr "Brez naslova"
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3591,16 +3596,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3609,153 +3614,153 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
diff --git a/po/sr.po b/po/sr.po
index 1004dba8..a5735d63 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -330,7 +330,7 @@ msgstr "Kopiram poruke %s%c%d u %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Posednji broj u direktoriju %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1205,11 +1205,11 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Upozorenje"
 
@@ -1734,7 +1734,7 @@ msgstr "MIME tip"
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Pošalji"
@@ -2329,12 +2329,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2585,7 +2585,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Sled."
 
@@ -2812,20 +2812,20 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ne podržava g_thread.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2835,53 +2835,58 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:368
+#: src/main.c:371
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:369
+#: src/main.c:372
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                debug način"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2895,19 +2900,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2916,16 +2921,16 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3549,34 +3554,34 @@ msgstr "Neimenovano"
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3587,16 +3592,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3605,153 +3610,153 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
diff --git a/po/sv.po b/po/sv.po
index 5f646385..c5d81556 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -323,7 +323,7 @@ msgstr "Kopierar meddelande %s%c%d till %s...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Sista tal i mapp %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1202,11 +1202,11 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Varning"
 
@@ -1698,7 +1698,7 @@ msgstr "MIME-typ"
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Skicka"
@@ -2283,12 +2283,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2539,7 +2539,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Nästa"
 
@@ -2768,20 +2768,20 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread stöds inte av glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2791,23 +2791,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2815,28 +2815,33 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug               felsökningsläge"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Filnamn kodning"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2860,19 +2865,19 @@ msgstr ""
 "\n"
 "Fortsätt?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2881,15 +2886,15 @@ msgstr ""
 "OpenPGP-stöd avstängt."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3484,32 +3489,32 @@ msgstr "Namnlös"
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3519,16 +3524,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3537,149 +3542,149 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Sätt som skräppost"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 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:2538
+#: src/mainwindow.c:2541
 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:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
diff --git a/po/tr.po b/po/tr.po
index 4cd3ebf6..b8aed108 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -331,7 +331,7 @@ msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Dizindeki son numara %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1207,11 +1207,11 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -1727,7 +1727,7 @@ msgstr "MIME türü"
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Gönder"
@@ -2320,12 +2320,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2575,7 +2575,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2805,20 +2805,20 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread, glib tarafından desteklenmiyor.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2828,23 +2828,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2852,29 +2852,34 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                hata ayıklama modu"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2888,19 +2893,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2909,16 +2914,16 @@ msgstr ""
 "OpenPGP desteği kapatıldı."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3525,33 +3530,33 @@ msgstr "Başlıksız"
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, 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:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3562,16 +3567,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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,150 +3585,150 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 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:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
diff --git a/po/uk.po b/po/uk.po
index f8018c51..297af81f 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: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -328,7 +328,7 @@ msgstr "Копіюємо лист %s%c%d в %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Останній номер в каталозі %s = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1205,11 +1205,11 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "Попередження"
 
@@ -1700,7 +1700,7 @@ msgstr "тип MIME"
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "Послати"
@@ -2285,12 +2285,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2541,7 +2541,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "Далі"
 
@@ -2770,20 +2770,20 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не підтримується glib.\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Вживання: %s [ОПЦІЇ]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    відкрити вікно для нового листа"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2793,23 +2793,23 @@ msgstr ""
 "                         відкрити вікно створення з приєднанням вказаних\n"
 "                         файлів"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              отримати нові листи"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          отримати нові листи для всіх записів"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 відіслати всі відкладені листи"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   показати загальну кількість листів"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2817,28 +2817,33 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         показати стан кожної папки"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                режим відлагодження"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим відлагодження"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 показати цю довідку і вийти"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              видати інформацію про версію і вийти"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "Кодова таблиця для імен файлів"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2862,19 +2867,19 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "Є незавершені листи. Справді вийти?"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "Листи в черзі"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2883,15 +2888,15 @@ msgstr ""
 "Відключено підтримку OpenPGP."
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3486,32 +3491,32 @@ msgstr "БезНазви"
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3521,16 +3526,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3540,149 +3545,149 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "Вважати мотлохом"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f02f028a..53db0e8e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -326,7 +326,7 @@ msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "目录 %s 的最后一个序号 = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1193,11 +1193,11 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "警告"
 
@@ -1690,7 +1690,7 @@ msgstr "MIME 类型"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "发送"
@@ -2281,12 +2281,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2536,7 +2536,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "下一个"
 
@@ -2766,20 +2766,20 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支持 g_thread。\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2788,23 +2788,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2812,29 +2812,34 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                调试模式"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:496
+#: src/main.c:500
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2848,19 +2853,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2869,15 +2874,15 @@ msgstr ""
 "已禁用 OpenPGP 支持。"
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3479,33 +3484,33 @@ msgstr "无标题"
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3515,16 +3520,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3533,150 +3538,150 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr ""
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 #, fuzzy
 msgid "Set as junk mail"
 msgstr "设置为默认帐号"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ec49285c..18b164eb 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: 2005-11-07 18:07+0900\n"
+"POT-Creation-Date: 2005-11-07 18:52+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"
@@ -325,7 +325,7 @@ msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "目錄 %s 中最後的編號 = %d\n"
 
-#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:145
+#: libsylph/mh.c:826 libsylph/mh.c:839 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -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:2303 src/prefs_actions.c:266
+#: src/editaddress.c:1017 src/mainwindow.c:2306 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
@@ -1198,11 +1198,11 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:544
+#: src/alertpanel.c:141 src/compose.c:5250 src/main.c:555
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:154 src/main.c:639
+#: src/alertpanel.c:154 src/main.c:657
 msgid "Warning"
 msgstr "警告"
 
@@ -1692,7 +1692,7 @@ msgstr "MIME 型態"
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4510 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4510 src/mainwindow.c:2239 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:629
 msgid "Send"
 msgstr "送出"
@@ -2277,12 +2277,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:830 src/mainwindow.c:3301 src/setup.c:80
+#: src/folderview.c:830 src/mainwindow.c:3304 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:834 src/mainwindow.c:3306 src/setup.c:85
+#: src/folderview.c:834 src/mainwindow.c:3309 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2533,7 +2533,7 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2332
+#: src/importldif.c:768 src/mainwindow.c:2335
 msgid "Next"
 msgstr "下一封"
 
@@ -2760,20 +2760,20 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:191
+#: src/main.c:192
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支援 g_thread。\n"
 
-#: src/main.c:358
+#: src/main.c:361
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [選項]...\n"
 
-#: src/main.c:361
+#: src/main.c:364
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]   直接開啟撰寫郵件視窗"
 
-#: src/main.c:362
+#: src/main.c:365
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2782,50 +2782,55 @@ msgstr ""
 "  --attach 檔案1 [檔案2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:365
+#: src/main.c:368
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:366
+#: src/main.c:369
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:367
+#: src/main.c:370
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的郵件"
 
-#: src/main.c:368
+#: src/main.c:371
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示資料夾內總共有多少郵件"
 
-#: src/main.c:369
+#: src/main.c:372
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [資料夾]...     顯示每個資料夾中有多少郵件"
 
-#: src/main.c:371
+#: src/main.c:374
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:375
+#, fuzzy
+msgid "  --exit                 exit Sylpheed"
+msgstr "  --debug                除錯模式"
+
+#: src/main.c:376
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:373
+#: src/main.c:377
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:374
+#: src/main.c:378
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:496
+#: src/main.c:500
 msgid "Filename encoding"
 msgstr "檔案名稱編碼"
 
-#: src/main.c:497
+#: src/main.c:501
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -2846,19 +2851,19 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: src/main.c:545
+#: src/main.c:556
 msgid "Composing message exists. Really quit?"
 msgstr "有郵件正在編輯。確定要離開嗎？"
 
-#: src/main.c:553
+#: src/main.c:567
 msgid "Queued messages"
 msgstr "有未送出郵件"
 
-#: src/main.c:554
+#: src/main.c:568
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:640
+#: src/main.c:658
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2867,15 +2872,15 @@ msgstr ""
 "關閉 OpenPGP 支援項目。"
 
 #. remote command mode
-#: src/main.c:803
+#: src/main.c:821
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1012
+#: src/main.c:1038
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1013
+#: src/main.c:1039
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3470,32 +3475,32 @@ msgstr "無標題"
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1315
+#: src/mainwindow.c:1318
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1549
+#: src/mainwindow.c:1552
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1550
+#: src/mainwindow.c:1553
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1564
+#: src/mainwindow.c:1567
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1565
+#: src/mainwindow.c:1568
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1593
+#: src/mainwindow.c:1596
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1594
+#: src/mainwindow.c:1597
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3505,16 +3510,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1600 src/setup.c:49
+#: src/mainwindow.c:1603 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1605 src/setup.c:56
+#: src/mainwindow.c:1608 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1611 src/setup.c:62
+#: src/mainwindow.c:1614 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 "
@@ -3523,149 +3528,149 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2004
+#: src/mainwindow.c:2007
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2027
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2171 src/summaryview.c:380
+#: src/mainwindow.c:2174 src/summaryview.c:380
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2172
+#: src/mainwindow.c:2175
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2173
+#: src/mainwindow.c:2176
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2174
+#: src/mainwindow.c:2177
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2179 src/summaryview.c:387
+#: src/mainwindow.c:2182 src/summaryview.c:387
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2180 src/summaryview.c:388
+#: src/mainwindow.c:2183 src/summaryview.c:388
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2181 src/summaryview.c:389
+#: src/mainwindow.c:2184 src/summaryview.c:389
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2218
+#: src/mainwindow.c:2221
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2228
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2226
+#: src/mainwindow.c:2229
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/mainwindow.c:2247 src/prefs_account_dialog.c:518
+#: src/mainwindow.c:2250 src/prefs_account_dialog.c:518
 #: src/prefs_common_dialog.c:631 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2248
+#: src/mainwindow.c:2251
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2256 src/prefs_common_dialog.c:1129
+#: src/mainwindow.c:2259 src/prefs_common_dialog.c:1129
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2257 src/mainwindow.c:2270
+#: src/mainwindow.c:2260 src/mainwindow.c:2273
 msgid "Reply to the message"
 msgstr "回覆郵件"
 
-#: src/mainwindow.c:2274
+#: src/mainwindow.c:2277
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2275
+#: src/mainwindow.c:2278
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2283 src/prefs_filter_edit.c:741
+#: src/mainwindow.c:2286 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2284 src/mainwindow.c:2297
+#: src/mainwindow.c:2287 src/mainwindow.c:2300
 msgid "Forward the message"
 msgstr "轉寄郵件"
 
-#: src/mainwindow.c:2304
+#: src/mainwindow.c:2307
 msgid "Delete the message"
 msgstr "刪除郵件"
 
-#: src/mainwindow.c:2312 src/prefs_common_dialog.c:1752
+#: src/mainwindow.c:2315 src/prefs_common_dialog.c:1752
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/mainwindow.c:2313
+#: src/mainwindow.c:2316
 msgid "Set as junk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/mainwindow.c:2322
+#: src/mainwindow.c:2325
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2323
+#: src/mainwindow.c:2326
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2333
+#: src/mainwindow.c:2336
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2345
+#: src/mainwindow.c:2348
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2346
+#: src/mainwindow.c:2349
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2354 src/prefs_folder_item.c:288
+#: src/mainwindow.c:2357 src/prefs_folder_item.c:288
 #: src/prefs_folder_item.c:299 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2355
+#: src/mainwindow.c:2358
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2527
+#: src/mainwindow.c:2530
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2538
+#: src/mainwindow.c:2541
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2731
+#: src/mainwindow.c:2734
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"