also update sort indicator at empty folder. Updated NEWS.

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

29 files changed, 2871 insertions, 2871 deletions

diff --git a/po/bg.po b/po/bg.po
index dc66adf0..5eda5059 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -597,8 +597,8 @@ msgstr "  Субект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Издател: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
@@ -684,7 +684,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -822,7 +822,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -965,7 +965,7 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1184,7 +1184,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1235,7 +1235,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Никой"
 
@@ -1673,7 +1673,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1682,15 +1682,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1699,155 +1699,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "НЕВАЛИДЕН подпис"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1857,48 +1857,48 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -3627,8 +3627,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -3937,25 +3937,25 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5930,17 +5930,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Дата"
 
@@ -6634,106 +6634,106 @@ msgstr "%d нови, %d непрочетени, %d общо"
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "No."
 
@@ -6756,36 +6756,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6794,7 +6794,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index cee83687..da1d5cd1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -600,8 +600,8 @@ msgstr "  Předmět: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
@@ -687,7 +687,7 @@ msgstr ""
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -825,7 +825,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -968,7 +968,7 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -1185,7 +1185,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1236,7 +1236,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Žádná"
 
@@ -1674,7 +1674,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Chyba při konverzi databáze adres"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1683,15 +1683,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1700,155 +1700,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "ŠPATNÝ podpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1858,48 +1858,48 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -3630,8 +3630,8 @@ msgstr "Vytvářím hlavní okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3941,25 +3941,25 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5933,17 +5933,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6638,107 +6638,107 @@ msgstr "%d nových, %d nepřečtených, %d celkem"
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena pro přesun do %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Čís."
 
@@ -6762,36 +6762,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložit jako..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Společná adresa"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6800,7 +6800,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index d2f1642b..d56ab42f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -601,8 +601,8 @@ msgstr "  Emne: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
@@ -688,7 +688,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -826,7 +826,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -969,7 +969,7 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1182,7 +1182,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Note"
 
@@ -1233,7 +1233,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ingen"
 
@@ -1671,7 +1671,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1680,15 +1680,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1697,155 +1697,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "DÅRLIG underskrift"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1855,48 +1855,48 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -3630,8 +3630,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -3940,25 +3940,25 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5928,17 +5928,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Dato"
 
@@ -6636,109 +6636,109 @@ msgstr "%d nye, %d ulæste, %d total"
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr."
 
@@ -6762,36 +6762,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6800,7 +6800,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 98005a57..6df68809 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-07-30 17:35+0100\n"
 "Last-Translator: Enrico Troeger <enrico.troeger@uvena.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -604,8 +604,8 @@ msgstr "  Betreff: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
@@ -694,7 +694,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,7 +830,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -972,7 +972,7 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1190,7 +1190,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1241,7 +1241,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Keine"
 
@@ -1639,7 +1639,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1652,15 +1652,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1669,152 +1669,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Signatur anhängen"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1823,44 +1823,44 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -3553,8 +3553,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3878,24 +3878,24 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Diese Nachricht wird mit dem folgenden Befehl gedruckt:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5801,17 +5801,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6505,105 +6505,105 @@ msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr."
 
@@ -6626,31 +6626,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einfügen"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Öffne _mit Internet-Browser"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verknüpfung"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6663,7 +6663,7 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
diff --git a/po/el.po b/po/el.po
index 4fdaafdf..adb3e4a5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -608,8 +608,8 @@ msgstr "Θέμα: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Εκδότης: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
@@ -698,7 +698,7 @@ msgid ""
 msgstr ""
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -831,7 +831,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
@@ -978,7 +978,7 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1192,7 +1192,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1243,7 +1243,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Τέλος"
 
@@ -1691,7 +1691,7 @@ msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1700,15 +1700,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1717,162 +1717,162 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "Λάθος υπογραφή"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1882,49 +1882,49 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -3754,8 +3754,8 @@ msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -4076,25 +4076,25 @@ msgstr "Προσάρτηση"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6073,17 +6073,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6807,109 +6807,109 @@ msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Αρ."
 
@@ -6933,35 +6933,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Αποθήκευση ως..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Κοινές διευθύνσεις"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6970,7 +6970,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 3091ebe6..8f5ac9c9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-07-29 00:32+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -600,8 +600,8 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Emisor: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
@@ -689,7 +689,7 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -825,7 +825,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
@@ -967,7 +967,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1184,7 +1184,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1235,7 +1235,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ninguno"
 
@@ -1635,7 +1635,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1648,15 +1648,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1665,152 +1665,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Agregar firma"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La orden del editor externo es inválida: «%s»\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,44 +1819,44 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -3548,8 +3548,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3874,24 +3874,24 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "El mensaje se imprimirá con la orden siguiente:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Orden para imprimir por omisión)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5784,17 +5784,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Fecha"
 
@@ -6475,105 +6475,105 @@ msgstr "%d nuevos, %d no leídos, %d totales"
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "No."
 
@@ -6596,31 +6596,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6632,7 +6632,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index 2be4aeaa..dd0c4a22 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -605,8 +605,8 @@ msgstr "  Pealkiri: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Väljalaskja: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
@@ -692,7 +692,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -828,7 +828,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
@@ -971,7 +971,7 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1189,7 +1189,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1240,7 +1240,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1679,7 +1679,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1688,15 +1688,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1705,156 +1705,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "HALB allkiri"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1864,48 +1864,48 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -3635,8 +3635,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -3944,25 +3944,25 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5934,17 +5934,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6639,107 +6639,107 @@ msgstr "uusi %d, mitteloetuid %d, kokku %d"
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Ei."
 
@@ -6763,36 +6763,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6801,7 +6801,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index bae8bcee..ab541314 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-02-23 00:32+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -612,8 +612,8 @@ msgstr "  Sujet : %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Délivré par : %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
@@ -701,7 +701,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -837,7 +837,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -980,7 +980,7 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1199,7 +1199,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Information"
 
@@ -1250,7 +1250,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Aucun"
 
@@ -1651,7 +1651,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1664,15 +1664,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1681,152 +1681,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Ajouter la signature"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La ligne de commande pour l'éditeur externe est invalide : « %s »\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1835,46 +1835,46 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -3581,8 +3581,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3908,24 +3908,24 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Le message sera imprimer à l'aide de la commande suivante :"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Commande d'impression par défaut)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5828,17 +5828,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Date"
 
@@ -6524,107 +6524,107 @@ msgstr "%d nouveau(x), %d non lu(s), %d au total"
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "N°"
 
@@ -6647,31 +6647,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6683,7 +6683,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index e22a529d..178540dd 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -601,8 +601,8 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
@@ -690,7 +690,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -826,7 +826,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
@@ -969,7 +969,7 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1188,7 +1188,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1239,7 +1239,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ningún"
 
@@ -1678,7 +1678,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1687,15 +1687,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1704,155 +1704,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "Sinatura INVÁLIDA"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "o comando do editor externo non e válido: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,48 +1862,48 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -3634,8 +3634,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -3945,25 +3945,25 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5932,17 +5932,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Data"
 
@@ -6636,107 +6636,107 @@ msgstr "%d novas, %d non leídos, %d totales"
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Non."
 
@@ -6760,36 +6760,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6798,7 +6798,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index a26caa94..cf65ca0c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -609,8 +609,8 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
@@ -697,7 +697,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,7 +830,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -974,7 +974,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1186,7 +1186,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1237,7 +1237,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ništa"
 
@@ -1685,7 +1685,7 @@ msgstr "Ne mogu promjeniti charset poruke."
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1694,15 +1694,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1711,158 +1711,158 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski uređivač je pogrešna: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1872,49 +1872,49 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -3732,8 +3732,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4047,25 +4047,25 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6030,17 +6030,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6752,107 +6752,107 @@ msgstr "%d novih, %d nepročitanih, %d ukupno"
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Ne."
 
@@ -6876,35 +6876,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6913,7 +6913,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 7df254f5..148c05b8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-07-15 17:27+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -601,8 +601,8 @@ msgstr "  Tárgy: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Szerző: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
@@ -692,7 +692,7 @@ msgstr ""
 "funkció bekapcsolásához válassza ki a 'G' oszlopban a jelölődobozt!"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -829,7 +829,7 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
@@ -971,7 +971,7 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1184,7 +1184,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1235,7 +1235,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Semmi"
 
@@ -1635,7 +1635,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1648,15 +1648,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1665,152 +1665,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem lehet eltávolítani\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Aláírás csatolása"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,44 +1819,44 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Az üzenet megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -3549,8 +3549,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3875,24 +3875,24 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5794,17 +5794,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Dátum"
 
@@ -6487,105 +6487,105 @@ msgstr "%d új, %d olvasatlan, %d összesen"
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Db"
 
@@ -6608,31 +6608,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Ú_j üzenet szerkesztése"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6644,7 +6644,7 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
diff --git a/po/it.po b/po/it.po
index 90d5566a..84cf5ddf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-08-14 15:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -601,8 +601,8 @@ msgstr "  Oggetto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
@@ -692,7 +692,7 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -828,7 +828,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
@@ -970,7 +970,7 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1188,7 +1188,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1239,7 +1239,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Niente"
 
@@ -1640,7 +1640,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1654,15 +1654,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1671,152 +1671,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Aggiunge la firma"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La riga di comando per l'editor esterno non è valida: «%s»\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1825,44 +1825,44 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -3557,8 +3557,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3883,24 +3883,24 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Il messaggio sarà stampato con il seguente comando:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5803,17 +5803,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Data"
 
@@ -6497,105 +6497,105 @@ msgstr "%d nuovi, %d non letti, %d totale"
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "No."
 
@@ -6618,31 +6618,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Componi un n_uovo messaggio"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6655,7 +6655,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index 300de1df..386d9c14 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -599,8 +599,8 @@ msgstr "  Subject: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  発行者: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
@@ -688,7 +688,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -824,7 +824,7 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
@@ -966,7 +966,7 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -1181,7 +1181,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "注意"
 
@@ -1232,7 +1232,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "なし"
 
@@ -1630,7 +1630,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1643,15 +1643,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1665,152 +1665,152 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "署名を追加"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,44 +1819,44 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -3546,8 +3546,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3870,24 +3870,24 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5778,17 +5778,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "日付"
 
@@ -6469,105 +6469,105 @@ msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "番号"
 
@@ -6592,31 +6592,31 @@ msgstr ""
 "一時ファイルへの書き込みが失敗したため、このメッセージ本文は表示できませんで"
 "した。\n"
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "アドレス帳に追加(_B)..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "アドレスをコピー(_R)"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Webブラウザで開く(_O)"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "リンクをコピー(_L)"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6629,7 +6629,7 @@ msgstr ""
 "\n"
 "とにかく開きますか?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
 
diff --git a/po/ko.po b/po/ko.po
index 1940f0f3..177bfdaf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -605,8 +605,8 @@ msgstr "  제목: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  발행인: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
@@ -681,7 +681,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -817,7 +817,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
@@ -960,7 +960,7 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "주소록"
 
@@ -1172,7 +1172,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "알림"
 
@@ -1223,7 +1223,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "없음"
 
@@ -1661,7 +1661,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1670,15 +1670,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1687,156 +1687,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "BAD signature"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1846,48 +1846,48 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -3608,8 +3608,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3918,25 +3918,25 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5882,17 +5882,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "날짜"
 
@@ -6581,107 +6581,107 @@ msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "번호"
 
@@ -6705,36 +6705,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6743,7 +6743,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 03eda783..2cbc8ee7 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -600,8 +600,8 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Leidėjas: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
@@ -688,7 +688,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -824,7 +824,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
@@ -966,7 +966,7 @@ msgstr "/_Ištrinti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1179,7 +1179,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1230,7 +1230,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Nieko"
 
@@ -1629,7 +1629,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1642,15 +1642,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1659,152 +1659,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Siųsti laišką"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Įterpti failą"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Prisegti failą"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Pridėti parašą"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,44 +1813,44 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -3541,8 +3541,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3866,24 +3866,24 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Laiškas bus atspausdintas naudojant komandą:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Numatytoji spausdinimo komanda)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5775,17 +5775,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Data"
 
@@ -6468,105 +6468,105 @@ msgstr "nauji: %d, neskaityti: %d, viso: %d"
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr."
 
@@ -6589,31 +6589,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6626,7 +6626,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index 7428a715..b0b494e3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -605,8 +605,8 @@ msgstr "  Onderwerp: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
@@ -696,7 +696,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -832,7 +832,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -974,7 +974,7 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1190,7 +1190,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1241,7 +1241,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Geen"
 
@@ -1640,7 +1640,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1653,15 +1653,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1670,152 +1670,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Handtekening toevoegen"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1824,44 +1824,44 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -3560,8 +3560,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3890,24 +3890,24 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Het bericht zal afgedrukt worden met de volgende opdracht:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Standaard afdrukopdracht)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5810,17 +5810,17 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6504,106 +6504,106 @@ msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr."
 
@@ -6626,31 +6626,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Afbeelding opslaan _als..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "_Nieuw bericht opstellen"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "_Adres kopiëren"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Openen met webbrowser"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "_Link kopiëren"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6663,7 +6663,7 @@ msgstr ""
 "\n"
 "Wilt u het toch openen?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Waarschuwing! Misleidende link"
 
diff --git a/po/pl.po b/po/pl.po
index badc7eeb..fa973010 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -595,8 +595,8 @@ msgstr "Temat: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
@@ -685,7 +685,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -822,7 +822,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -965,7 +965,7 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -1185,7 +1185,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1236,7 +1236,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Brak"
 
@@ -1642,7 +1642,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1651,15 +1651,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1668,153 +1668,153 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "ZŁY podpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1824,47 +1824,47 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -3560,8 +3560,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3867,25 +3867,25 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5815,17 +5815,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Data"
 
@@ -6537,105 +6537,105 @@ msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr"
 
@@ -6658,35 +6658,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6695,7 +6695,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f7afe311..0bbc9f37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-09-18 00:02-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -607,8 +607,8 @@ msgstr "  Assunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
@@ -694,7 +694,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,7 +830,7 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
@@ -972,7 +972,7 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1189,7 +1189,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1240,7 +1240,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1639,7 +1639,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1652,15 +1652,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1669,152 +1669,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Apender assinatura"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linha de comando do editor externo inválida: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1823,44 +1823,44 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -3555,8 +3555,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3881,24 +3881,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5796,17 +5796,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Data"
 
@@ -6488,105 +6488,105 @@ msgstr "%d novas, %d não lidas, %d no total"
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nº"
 
@@ -6609,31 +6609,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6646,7 +6646,7 @@ msgstr ""
 "\n"
 "Abrí-la mesmo assim?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/ro.po b/po/ro.po
index 80353552..0effad08 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-04-17 02:04+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -611,8 +611,8 @@ msgstr "  Subiect: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Eliberat de: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fişierului\n"
 
@@ -703,7 +703,7 @@ msgstr ""
 "pentru a activa recepţionarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -847,7 +847,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Agendă"
@@ -991,7 +991,7 @@ msgstr "/Ş_terge"
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1208,7 +1208,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1260,7 +1260,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Nimic"
 
@@ -1663,7 +1663,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1676,15 +1676,15 @@ msgstr ""
 "\n"
 "Îl trimit oricum ?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1693,154 +1693,154 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "nu se poate şterge mesajul vechi\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de aşteptare...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de aşteptare\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Dimensiune"
 
 # obs: comun şi pentru butonul din toolbar şi pentru tab-ul din common preferences şi edit accounts
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Trimite"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Trimite acum"
 
 # hm ? sau trimite mai târziu ?
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Pune în coada de aşteptare şi trimite mai târziu"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Ciornă"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Salvează în folderul de ciorne"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Iserează fişier"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Ataşează"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Ataşează fişier"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Adaugă semnătură"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Desparte liniile"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Nume fişier"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,44 +1849,44 @@ msgstr ""
 "Editorul extern este încă în funcţiune.\n"
 "Forţaţi terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de aşteptare."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Selectează fişiere"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Selectează fişier"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvaţi în folderul ciorne ?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriţi să aplicaţi şablonul '%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Aplică şablon"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "Înl_ocuieşte"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -3607,8 +3607,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3945,25 +3945,25 @@ msgstr "Ataşamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fişierul '%s'."
 
 # hm ?
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Mesajul va fi imprimat cu următoarea comandă:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Comandă de imprimare predefinită)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5893,17 +5893,17 @@ msgid "Attachment"
 msgstr "Ataşament"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Dată"
 
@@ -6596,105 +6596,105 @@ msgstr "%d nou(i), %d necitit(e), %d în total"
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tSetare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Setare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj(e)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Sigur doriţi să ştergeţi mesajul(ele) de la gunoi ?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia pentru copiere este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nu."
 
@@ -6717,32 +6717,32 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Sal_vează acestă imagine ca..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Compune mesaj _nou"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Adăugă în a_gendă..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Copiază această ad_resă"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Deschide cu browser Web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Copiază această _legătură"
 
 # !!! de verificat cum arată practic !!!
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6755,7 +6755,7 @@ msgstr ""
 "\n"
 "Îl deschid oricum ?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Avertizare de URL fals"
 
diff --git a/po/ru.po b/po/ru.po
index db4437d7..153bff77 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -603,8 +603,8 @@ msgstr "  Субъект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Сертификат выдал: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
@@ -693,7 +693,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -829,7 +829,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
@@ -971,7 +971,7 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1187,7 +1187,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1238,7 +1238,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Нет"
 
@@ -1637,7 +1637,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1650,15 +1650,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1667,152 +1667,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Добавить подпись"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1822,44 +1822,44 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -3552,8 +3552,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3879,24 +3879,24 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Сообщение будет напечатано с помощью следующей команды:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Команда печати по умолчанию)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5796,17 +5796,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Дата"
 
@@ -6490,105 +6490,105 @@ msgstr "%d новых, %d непрочитанных, %d всего"
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Номер"
 
@@ -6611,31 +6611,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Сохранить изображение как..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Добавить в адресную книгу"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Копировать адрес"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Открыть в браузере"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Копировать ссылку"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6648,7 +6648,7 @@ msgstr ""
 "\n"
 "Всё равно открыть?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Внимание - подмена URL"
 
diff --git a/po/sk.po b/po/sk.po
index cf6c694c..70e74b50 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -599,8 +599,8 @@ msgstr "  Predmet: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavateľ: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
@@ -686,7 +686,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -824,7 +824,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
@@ -967,7 +967,7 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -1186,7 +1186,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1237,7 +1237,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Žiadna"
 
@@ -1675,7 +1675,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,155 +1701,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "CHYBNÝ podpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,48 +1859,48 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -3625,8 +3625,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3936,25 +3936,25 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5927,17 +5927,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Dátum"
 
@@ -6632,106 +6632,106 @@ msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Č."
 
@@ -6754,36 +6754,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6792,7 +6792,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index fc956e1d..dac11695 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -605,8 +605,8 @@ msgstr "  Zadeva: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
@@ -694,7 +694,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,7 +830,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -973,7 +973,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1191,7 +1191,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1242,7 +1242,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Nič"
 
@@ -1680,7 +1680,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1689,15 +1689,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1706,156 +1706,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "SLAB podpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1865,48 +1865,48 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -3630,8 +3630,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -3940,25 +3940,25 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5930,17 +5930,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6633,107 +6633,107 @@ msgstr "%d novih, %d neprebranih, skupaj %d"
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Ne."
 
@@ -6757,36 +6757,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6795,7 +6795,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 3fa72703..d60a55ad 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -606,8 +606,8 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
@@ -694,7 +694,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -830,7 +830,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -973,7 +973,7 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1185,7 +1185,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1236,7 +1236,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ništa"
 
@@ -1675,7 +1675,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1701,156 +1701,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1860,48 +1860,48 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -3626,8 +3626,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3936,25 +3936,25 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5925,17 +5925,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6631,107 +6631,107 @@ msgstr "%d novih, %d nepročitanih, %d ukupno"
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Ne."
 
@@ -6755,36 +6755,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6793,7 +6793,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 0a6024a6..af849026 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -601,8 +601,8 @@ msgstr "  Ärende:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Utfärdare: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
@@ -691,7 +691,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -827,7 +827,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
@@ -970,7 +970,7 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1182,7 +1182,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Notera"
 
@@ -1233,7 +1233,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ingen"
 
@@ -1638,7 +1638,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1651,15 +1651,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1668,153 +1668,153 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "FELAKTIG signatur"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1824,44 +1824,44 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -3562,8 +3562,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3865,24 +3865,24 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Meddelandet kommer att skrivas ut med följande kommando:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5798,17 +5798,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Datum"
 
@@ -6500,105 +6500,105 @@ msgstr "%d nya, %d olästa, %d totalt"
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Nr."
 
@@ -6621,31 +6621,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6658,7 +6658,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index 0c45923a..0f0c3e48 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -603,8 +603,8 @@ msgstr "  Konu: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
@@ -689,7 +689,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -827,7 +827,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -970,7 +970,7 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1187,7 +1187,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Not"
 
@@ -1238,7 +1238,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1668,7 +1668,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1677,15 +1677,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1694,155 +1694,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "KÖTÜ imza"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Harici düzenleyici komut satırı geçersiz: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1852,48 +1852,48 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -3602,8 +3602,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3908,25 +3908,25 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5874,17 +5874,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Tarih"
 
@@ -6582,105 +6582,105 @@ msgstr "%d yeni, %d okunmamış, toplam %d"
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Hayır."
 
@@ -6703,36 +6703,36 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Tarayıcı"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6744,7 +6744,7 @@ msgstr ""
 "görünenden (%s) farklı.\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 8b51e294..b742e6f2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-04-13 00:34+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -608,8 +608,8 @@ msgstr "  Суб'єкт  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Видав: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
@@ -696,7 +696,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -832,7 +832,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
@@ -974,7 +974,7 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1184,7 +1184,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1235,7 +1235,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Ніякий"
 
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1647,15 +1647,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1664,152 +1664,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Чернетка"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Приєднати підпис"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,44 +1818,44 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -3546,8 +3546,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3871,24 +3871,24 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Лист буде надруковано наступною командою:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Команда друку за замовчуванням)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5781,17 +5781,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Дата"
 
@@ -6474,105 +6474,105 @@ msgstr "%d нових, %d непрочитаних, %d загалом"
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Номер"
 
@@ -6595,31 +6595,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "Зберегти зображення як..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6632,7 +6632,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
diff --git a/po/vi.po b/po/vi.po
index 71e78b50..b779b1e3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -599,8 +599,8 @@ msgstr "  Tiêu đề: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Người phát hành: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
@@ -673,7 +673,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -809,7 +809,7 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Địa chỉ"
@@ -951,7 +951,7 @@ msgstr "/_Xoá"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -1165,7 +1165,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1216,7 +1216,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "Không"
 
@@ -1615,7 +1615,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1628,15 +1628,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1645,152 +1645,152 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Gửi"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "Gửi thư"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "Gửi sau"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "Đưa vào thư mục `Đợi gửi' và gửi sau"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "Bản nháp"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "Chèn"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "Chèn tập tin"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "Đính kèm"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 msgid "Append signature"
 msgstr "Chèn chữ kí "
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "Soạn với trình soạn thảo ngoài"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "Khuôn dòng"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1799,44 +1799,44 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -3527,8 +3527,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3852,24 +3852,24 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr "Thư sẽ được in ra với dòng lệnh sau:"
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 msgid "(Default print command)"
 msgstr "(Lệnh in mặc định)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5759,17 +5759,17 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6450,105 +6450,105 @@ msgstr "%d mới, %d chưa đọc, %d tổng số"
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "Số "
 
@@ -6571,31 +6571,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6608,7 +6608,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed928595..101298d1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -598,8 +598,8 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -683,7 +683,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -821,7 +821,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -964,7 +964,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1173,7 +1173,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "注意"
 
@@ -1224,7 +1224,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "没有"
 
@@ -1632,7 +1632,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1641,15 +1641,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1658,155 +1658,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1816,47 +1816,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -3556,8 +3556,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3861,25 +3861,25 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5807,17 +5807,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "日期"
 
@@ -6511,105 +6511,105 @@ msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "No."
 
@@ -6632,35 +6632,35 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6672,7 +6672,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b12feb00..d6fa9cef 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-19 11:22+0900\n"
+"POT-Creation-Date: 2006-09-21 11:06+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"
@@ -602,8 +602,8 @@ msgstr "  主旨: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  發信人: %s\n"
 
-#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
-#: src/compose.c:3254 src/compose.c:3374
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3197
+#: src/compose.c:3260 src/compose.c:3380
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
@@ -688,7 +688,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4368 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4374 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -824,7 +824,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:202 src/compose.c:4872 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4878 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -967,7 +967,7 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4879 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -1178,7 +1178,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5593 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5605 src/main.c:622
 msgid "Notice"
 msgstr "注意"
 
@@ -1229,7 +1229,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4857
 msgid "None"
 msgstr "無"
 
@@ -1632,7 +1632,7 @@ msgstr ""
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3017
+#: src/compose.c:3023
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1645,15 +1645,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3150
+#: src/compose.c:3156
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3151
+#: src/compose.c:3157
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1662,153 +1662,153 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3334
+#: src/compose.c:3340
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3352
+#: src/compose.c:3358
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3434
+#: src/compose.c:3440
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4070
+#: src/compose.c:4076
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4183
+#: src/compose.c:4189
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4234 src/headerview.c:54
+#: src/compose.c:4240 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4308
+#: src/compose.c:4314
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4311
+#: src/compose.c:4317
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4349 src/compose.c:5427
+#: src/compose.c:4355 src/compose.c:5439
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4358 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5003
+#: src/compose.c:4364 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5001
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4799 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:4794
+#: src/compose.c:4800
 msgid "Send message"
 msgstr "送出郵件"
 
-#: src/compose.c:4802
+#: src/compose.c:4808
 msgid "Send later"
 msgstr "稍後再送出"
 
-#: src/compose.c:4803
+#: src/compose.c:4809
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中稍後再送出"
 
-#: src/compose.c:4811
+#: src/compose.c:4817
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4812
+#: src/compose.c:4818
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4822
+#: src/compose.c:4828
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4823
+#: src/compose.c:4829
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4831
+#: src/compose.c:4837
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4832
+#: src/compose.c:4838
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4842 src/prefs_account_dialog.c:1209
+#: src/compose.c:4848 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "簽章"
 
-#: src/compose.c:4843
+#: src/compose.c:4849
 #, fuzzy
 msgid "Append signature"
 msgstr "簽章檢查錯誤"
 
 #. editor
-#: src/compose.c:4852 src/prefs_common_dialog.c:1024
+#: src/compose.c:4858 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4853
+#: src/compose.c:4859
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4861
+#: src/compose.c:4867
 msgid "Linewrap"
 msgstr "折列"
 
-#: src/compose.c:4862
+#: src/compose.c:4868
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5323
+#: src/compose.c:5335
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5341
+#: src/compose.c:5353
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5409
+#: src/compose.c:5421
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5429 src/prefs_common_dialog.c:1477
+#: src/compose.c:5441 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5452 src/prefs_folder_item.c:202
+#: src/compose.c:5464 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5453
+#: src/compose.c:5465
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5542
+#: src/compose.c:5554
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5590
+#: src/compose.c:5602
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,44 +1818,44 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
+#: src/compose.c:5978 src/compose.c:5983 src/compose.c:5989
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6068
+#: src/compose.c:6080
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6091
+#: src/compose.c:6103
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6126
+#: src/compose.c:6138
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6127
+#: src/compose.c:6139
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6129
+#: src/compose.c:6141
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6171
+#: src/compose.c:6183
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6173
+#: src/compose.c:6185
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6174
+#: src/compose.c:6186
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -3545,8 +3545,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
-#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
+#: src/mainwindow.c:1141 src/summaryview.c:2359 src/summaryview.c:2444
+#: src/summaryview.c:3998 src/summaryview.c:4127 src/summaryview.c:4489
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3848,25 +3848,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3530
+#: src/messageview.c:702 src/summaryview.c:3528
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:760 src/summaryview.c:3553
+#: src/messageview.c:760 src/summaryview.c:3551
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3554
+#: src/messageview.c:761 src/summaryview.c:3552
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3554
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:771 src/summaryview.c:3564
+#: src/messageview.c:771 src/summaryview.c:3562
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5768,17 +5768,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4994
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4997
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4999
 msgid "Date"
 msgstr "日期"
 
@@ -6469,105 +6469,105 @@ msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2294
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2298
+#: src/summaryview.c:2296
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2405
+#: src/summaryview.c:2403
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2750
+#: src/summaryview.c:2748
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2810
+#: src/summaryview.c:2808
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:3002
+#: src/summaryview.c:3000
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3063
+#: src/summaryview.c:3061
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3091
+#: src/summaryview.c:3089
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3092
+#: src/summaryview.c:3090
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3166
+#: src/summaryview.c:3164
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3204
+#: src/summaryview.c:3202
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3262
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3294
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3360
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3391
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3601
+#: src/summaryview.c:3599
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3907 src/summaryview.c:3908
+#: src/summaryview.c:3905 src/summaryview.c:3906
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4058 src/summaryview.c:4059
+#: src/summaryview.c:4056 src/summaryview.c:4057
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4352 src/summaryview.c:4410
+#: src/summaryview.c:4350 src/summaryview.c:4408
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4461
+#: src/summaryview.c:4459
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4462
+#: src/summaryview.c:4460
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4498
+#: src/summaryview.c:4496
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:5005
+#: src/summaryview.c:5003
 msgid "No."
 msgstr "No."
 
@@ -6590,31 +6590,31 @@ msgid ""
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1977
+#: src/textview.c:1984
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:1993 src/trayicon.c:114
+#: src/textview.c:2000 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:1995
+#: src/textview.c:2002
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:1997
+#: src/textview.c:2004
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:2000
+#: src/textview.c:2007
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:2002
+#: src/textview.c:2009
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2145
+#: src/textview.c:2152
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6626,7 +6626,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2150
+#: src/textview.c:2157
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"