updated po files.

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

30 files changed, 6044 insertions, 5483 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7707064c..d6205d5c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-19
+
+	* updated pt_BR.po.
+
 2006-09-06
 
 	* updated pt_BR.po.
diff --git a/po/bg.po b/po/bg.po
index aeac6b65..dc66adf0 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -430,54 +430,54 @@ msgstr "Появи се грешка при публикуване\n"
 msgid "Error occurred while sending command\n"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Не е намерен необходим APOP времеви отпечатък в поздрава\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Синтактична грешка във времевия отпечатък в поздрава\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 протоколна грешка\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "невалиден xover ред: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Изтриване на съобщениe с изтекъл срок %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Прескачане на съобщение %d (%d байта)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "пощенската кутия е заключена\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "сесията е просрочена\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "не може да се стартира TLS сесия\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "грешка при удостоверяване\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "командата не се поддържа\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "грешка при POP3 сесията\n"
 
@@ -506,20 +506,20 @@ msgstr "Папка"
 msgid "Junk mail filter"
 msgstr "Папка"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "не може да се отвори файлът с маркировките\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1142,7 +1142,7 @@ msgstr "Конвертиране на адресната книга"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
@@ -1184,7 +1184,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Никой"
 
@@ -1609,7 +1609,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1686,155 +1686,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "НЕВАЛИДЕН подпис"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1844,48 +1857,48 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -1950,7 +1963,7 @@ msgstr "Местене нагоре"
 msgid "Move Down"
 msgstr "Местене надолу"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Променяне"
 
@@ -2069,7 +2082,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2516,7 +2529,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2576,68 +2589,68 @@ msgstr "Грешка при четене на LDIF полета."
 msgid "LDIF file imported successfully."
 msgstr "LDIF файла е внесен успешно."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Изберете LDIF Файл"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Име на файл"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF поле"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Име на атрибут"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Избор"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Адресна книга :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Име на файл :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Записи :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Внасяне на LDIF файл в Адресната книга"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Следващ"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Информация за файл"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Завършване"
 
@@ -2716,64 +2729,64 @@ msgstr "%s: Получаване на нови съобщения"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2782,28 +2795,28 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2812,11 +2825,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2825,16 +2838,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -3614,8 +3627,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -3924,25 +3937,25 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5917,17 +5930,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Дата"
 
@@ -6044,7 +6057,7 @@ msgstr "Сканиране на папка %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6245,7 +6258,7 @@ msgstr "Не е намерен подпис"
 msgid "Good signature from \"%s\""
 msgstr "Валиден подпис от \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Валиден подпис"
 
@@ -6254,7 +6267,7 @@ msgstr "Валиден подпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6291,7 +6304,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "НЕВАЛИДЕН подпис от \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "НЕВАЛИДЕН подпис"
 
@@ -6511,216 +6524,216 @@ msgstr "Има останали маркери. Желаете ли да се о
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "No."
 
@@ -6729,44 +6742,50 @@ msgstr "No."
 msgid "file %s already exists\n"
 msgstr "файл %s вече съществува\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Създаване на текстов изглед...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6775,7 +6794,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index b49a33e0..cee83687 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -433,54 +433,54 @@ msgstr "Během odesílání se vyskytla chyba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Během odesílání pošty se vyskytla chyba ."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Chyba syntaxe pro časovou značku při pozdravu\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Chyba protokolu POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Neplatná xover řádka: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Vymazávám starou zprávu %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Přeskakuji zprávu %d (%d bytů)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "poštovní schránka je zamčena\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "vypršel čas relace\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "Nelze spustit TLS relaci\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Vyskytla se chyba v autentizaci\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "Příkaz není podporován\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "v POP3 relaci se vyskytla\n"
 
@@ -509,20 +509,20 @@ msgstr "Složka"
 msgid "Junk mail filter"
 msgstr "Složka"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "nelze otevřít označený soubor\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkazový řádek tisku: '%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Databáze adres"
 
@@ -1143,7 +1143,7 @@ msgstr "Konverze databáze adres"
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Žádná"
 
@@ -1610,7 +1610,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -1687,155 +1687,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Připojí soubor"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "ŠPATNÝ podpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1845,48 +1858,48 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -1951,7 +1964,7 @@ msgstr "Posunout nahoru"
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Změnit"
 
@@ -2071,7 +2084,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2519,7 +2532,7 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -2579,68 +2592,68 @@ msgstr "Chyba při čtení LDIF položek."
 msgid "LDIF file imported successfully."
 msgstr "Import LDIF soubor byl úspěšný."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Výběr LDIF souboru"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Položky LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Název atributu"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Databáze adres :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Název souboru :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Záznamů :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importovat LDIF soubor do databáze adres"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Další"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Informace o souboru"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributy"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Konec"
 
@@ -2719,65 +2732,65 @@ msgstr "%s : Načítám nové zprávy"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojuji se na POP3 server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojení selhalo"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2786,28 +2799,28 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Chyba soketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2816,11 +2829,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2829,16 +2842,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypršel čas relace\n"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Načítám nové zprávy z %s do %s...\n"
@@ -3617,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3928,25 +3941,25 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5920,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -6046,7 +6059,7 @@ msgstr "Prohledávám složku %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
@@ -6249,7 +6262,7 @@ msgstr "Podpis nenalezen"
 msgid "Good signature from \"%s\""
 msgstr "Správný podpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Správný podpis"
 
@@ -6258,7 +6271,7 @@ msgstr "Správný podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6295,7 +6308,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "ŠPATNÝ podpis"
 
@@ -6515,217 +6528,217 @@ msgstr "Zbyly nějaké označené. Zpracovat je?"
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nejsou již žádné nepřečtené zprávy"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Nejsou již žádné nové zprávy"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nejsou již žádné označené zprávy"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Žádná neoznačená zpráva."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nejsou již žádné zprávy s návěštím"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva s návěštím. Hledat od konce?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Žádná zpráva s návěštím."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva s návěštím. Hledat od začátku?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Získávám zprávy od osoby..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazané"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěné"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " položky(ek) vybrány"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nových, %d nepřečtených, %d celkem"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, 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:2971
+#: src/summaryview.c:3002
 #, 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:3032
+#: src/summaryview.c:3063
 #, 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:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, 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:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Čís."
 
@@ -6734,45 +6747,51 @@ msgstr "Čís."
 msgid "file %s already exists\n"
 msgstr "soubor '%s' už existuje\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Vytvářím zobrazení textu...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "zpráva nebyla přijata\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložit jako..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Společná adresa"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6781,7 +6800,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index d8589b3e..d2f1642b 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -432,55 +432,55 @@ msgstr "Fejl ved afsendelse\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nødvendig APOP tid blev ikke fundet i velkomst\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tid syntax fejl i velkomst\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol fejl\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Sletter udløben meddelelse %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Sender meddelelse (%d / %d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "postkasse er låst\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "tid udløbet\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kan ikke starte TLS session\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "fejl ved godkendelse\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Kommando tekst"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
@@ -510,20 +510,20 @@ msgstr "Mappe"
 msgid "Junk mail filter"
 msgstr "Mappe"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "kan ikke åbne markéret fil\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1140,7 +1140,7 @@ msgstr "Adressebog konvertering"
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ingen"
 
@@ -1607,7 +1607,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1684,155 +1684,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "DÅRLIG underskrift"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1842,48 +1855,48 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -1948,7 +1961,7 @@ msgstr "Op"
 msgid "Move Down"
 msgstr "Ned"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Ændre"
 
@@ -2067,7 +2080,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2515,7 +2528,7 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2575,68 +2588,68 @@ msgstr "Fej ved læsning af LDIF fil."
 msgid "LDIF file imported successfully."
 msgstr "LDIF fil blev importeret."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Vælg LDIF fil"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Fil navn"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Vælg LDIF felt"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Egensgab Navn"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Egenskab"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Vælg"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adressebog :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Fil navn :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Poster :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importer LDIF fil til adressebog"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Næste"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Fil info"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Egenskaber"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Slut"
 
@@ -2715,68 +2728,68 @@ msgstr "%s: henter nye meddelelser"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2785,29 +2798,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2816,11 +2829,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2829,16 +2842,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3617,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -3927,25 +3940,25 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5915,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Dato"
 
@@ -6041,7 +6054,7 @@ msgstr "Gennemsøger mappe %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6247,7 +6260,7 @@ msgstr "Underskrift ikke fundet"
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Underskrift OK"
 
@@ -6256,7 +6269,7 @@ msgstr "Underskrift OK"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6293,7 +6306,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG underskrift fra \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "DÅRLIG underskrift"
 
@@ -6513,219 +6526,219 @@ msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr."
 
@@ -6734,45 +6747,51 @@ msgstr "Nr."
 msgid "file %s already exists\n"
 msgstr "filen %s eksisterer allerede\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Opretter tekst vindue...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6781,7 +6800,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index d4485d46..98005a57 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -438,54 +438,54 @@ msgstr "Fehler beim Senden\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fehler aufgetreten beim Senden eines Befehls\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Erforderlichen APOP-Zeitstempel in der Begrüßung nicht gefunden\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3-Protokollfehler\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ungültige UIDL-Antwort: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Lösche abgelaufene Nachricht %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Nachricht %d überspringen (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "Mailbox ist blockiert\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "Sitzungszeit abgelaufen\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kann TLS-Sitzung nicht beginnen\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Fehler während der Beglaubigung\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "Befehl wird nicht unterstützt\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
@@ -513,20 +513,20 @@ msgstr "Spam-Mail Filter"
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht öffnen\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1148,7 +1148,7 @@ msgstr "Adressbuch-Konvertierung"
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Keine"
 
@@ -1577,7 +1577,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1656,152 +1656,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Signatur anhängen"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,44 +1823,44 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -1911,7 +1924,7 @@ msgstr "Auf"
 msgid "Move Down"
 msgstr "Ab"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Ändern"
 
@@ -2030,7 +2043,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2471,7 +2484,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2532,68 +2545,68 @@ msgstr "Fehler beim Lesen der LDIF-Felder."
 msgid "LDIF file imported successfully."
 msgstr "LDIF-Datei erfolgreich importiert."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Wähle LDIF-Datei"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Dateiname"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF-Feld"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Eigenschaftenname"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Eigenschaft"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Wählen"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adressbuch :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Dateiname :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Felder :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importiere LDIF-Datei in Adressbuch"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Nächste"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Datei-Info"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Eigenschaften"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Ende"
 
@@ -2671,64 +2684,64 @@ msgstr "%s: Empfange neue Nachrichten"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2737,28 +2750,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2767,11 +2780,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2780,15 +2793,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3540,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3865,24 +3878,24 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5788,17 +5801,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -5915,7 +5928,7 @@ msgstr "Suche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6116,7 +6129,7 @@ msgstr "Keine digitale Unterschrift gefunden"
 msgid "Good signature from \"%s\""
 msgstr "Gute digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Gute digitale Unterschrift"
 
@@ -6127,7 +6140,7 @@ msgstr ""
 "Gültige digitale Unterschrift, aber dem Schlüssel für  \"%s\" wird nicht "
 "vertraut."
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Gültige digitale Unterschrift (Schlüssel wird nicht vertraut)"
 
@@ -6170,7 +6183,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "SCHLECHTE digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "SCHLECHTE digitale Unterschrift"
 
@@ -6383,214 +6396,214 @@ msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr."
 
@@ -6599,39 +6612,45 @@ msgstr "Nr."
 msgid "file %s already exists\n"
 msgstr "Datei %s existiert bereits\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Erstelle Textansicht...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einfügen"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Öffne _mit Internet-Browser"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verknüpfung"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6644,7 +6663,7 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
diff --git a/po/el.po b/po/el.po
index 856a5db6..4fdaafdf 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -434,57 +434,57 @@ msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 msgid "Error occurred while sending command\n"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Προαπαιτούμενη timestamp APOP δεν βρέθηκε στο χαιρετισμό\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Συντακτικό σφάλμα timestamp στο χαιρετισμό\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Σφάλμα πρωτοκόλλου POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "μη έγκυρη γραμμή xover: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, fuzzy, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "διαγράφω το μήνυμα %d...\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, fuzzy, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Εντολή"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
@@ -514,21 +514,21 @@ msgstr "Κατάλογος"
 msgid "Junk mail filter"
 msgstr "Κατάλογος"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 #, fuzzy
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1148,7 +1148,7 @@ msgstr "Μετατροπή βιβλίου διευθύνσεων"
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "Βιβλίο διευθύνσεων"
 
@@ -1192,7 +1192,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Τέλος"
 
@@ -1630,7 +1630,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
@@ -1704,162 +1704,175 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "Λάθος υπογραφή"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1869,49 +1882,49 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -1977,7 +1990,7 @@ msgstr "Μετακίνηση Πάνω"
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Τροποποίηση"
 
@@ -2098,7 +2111,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2561,7 +2574,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2626,75 +2639,75 @@ msgstr "Επέλεξε αρχείο εισαγωγής"
 msgid "LDIF file imported successfully."
 msgstr "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 #, fuzzy
 msgid "Select LDIF File"
 msgstr "Επιλογή αρχείου"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 #, fuzzy
 msgid "File Name"
 msgstr "Όνομα αρχείου"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr ""
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 #, fuzzy
 msgid "LDIF Field"
 msgstr "Επιλογή αρχείου"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr ""
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr ""
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Επιλογή"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 #, fuzzy
 msgid "Address Book :"
 msgstr "Βιβλίο διευθύνσεων"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 #, fuzzy
 msgid "File Name :"
 msgstr "Όνομα αρχείου"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr ""
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr ""
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 #, fuzzy
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Επόμενο"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 #, fuzzy
 msgid "File Info"
 msgstr "Όνομα αρχείου"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr ""
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr ""
 
@@ -2775,124 +2788,124 @@ msgstr "%s: Λαμβάνω τα νέα μηνύματα"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Συνδέομαι στον POP3 server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λαμβάνω το μέγεθος των μηνυμάτων (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνω το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 #, fuzzy
 msgid "Can't write file."
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 #, fuzzy
 msgid "Socket error."
 msgstr "σφάλμα πρωτοκόλλου\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Λήψη νέου mail"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λαμβάνω νέα μηνύματα από το %s στο %s...\n"
@@ -3741,8 +3754,8 @@ msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -4063,25 +4076,25 @@ msgstr "Προσάρτηση"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6060,17 +6073,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6195,7 +6208,7 @@ msgstr "Σάρωση καταλόγου %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6401,7 +6414,7 @@ msgstr "Δεν βρέθηκε υπογραφή"
 msgid "Good signature from \"%s\""
 msgstr "Αποδεκτή υπογραφή από \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Αποδεκτή υπογραφή"
 
@@ -6410,7 +6423,7 @@ msgstr "Αποδεκτή υπογραφή"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6447,7 +6460,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Λάθος υπογραφή από \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Λάθος υπογραφή"
 
@@ -6680,223 +6693,223 @@ msgstr "Μερικές σημάνσεις έχουν απομείνει. Να ε
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση καταλόγου (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Η αναζήτηση απέτυχε"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 #, fuzzy
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 #, fuzzy
 msgid "No new messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα μηνύματα με ετικέτες"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν μηνύματα με ετικέτες."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " μήνυμα(τα) επιλέχθηκε(αν)"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Αρ."
 
@@ -6905,44 +6918,50 @@ msgstr "Αρ."
 msgid "file %s already exists\n"
 msgstr "το %s υπάρχει ήδη"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Δημιουργώ απεικόνιση κειμένου...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Αποθήκευση ως..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Κοινές διευθύνσεις"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6951,7 +6970,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 89ec34fd..3091ebe6 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -434,54 +434,54 @@ msgstr "Hubo un error mientras se enviaba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Hubo un error enviando el mandato\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No se encontro en el saludo la marca temporal APOP requerida\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "La marca temporal del saludo tiene un error de sintaxis\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Error del protocolo POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL no válida: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Borrando mensaje caducado %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaje %d (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "tiempo de espera agotado para la sesión\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "no puedo iniciar la sesión TLs\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "hubo algún error en la autentificación\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "mandato no soportado\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "hubo algún error en la sesión POP3\n"
 
@@ -509,20 +509,20 @@ msgstr "Filtro de correo basura"
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1142,7 +1142,7 @@ msgstr "Conversión de la agenda"
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ninguno"
 
@@ -1571,7 +1571,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1652,152 +1652,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Agregar firma"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,44 +1819,44 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1907,7 +1920,7 @@ msgstr "Arriba"
 msgid "Move Down"
 msgstr "Abajo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
@@ -2026,7 +2039,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2468,7 +2481,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2528,68 +2541,68 @@ msgstr "Error leyendo los campos LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Fichero LDIF importado con éxito."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Seleccionar fichero LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nombre de atributo"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Registros :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importar fichero LDIF a la agenda"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Información de fichero"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -2667,64 +2680,64 @@ msgstr "%s: Recuperando nuevos mensajes"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2733,28 +2746,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2763,11 +2776,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2776,15 +2789,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3535,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3861,24 +3874,24 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Orden para imprimir por omisión)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5771,17 +5784,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Fecha"
 
@@ -5896,7 +5909,7 @@ msgstr "Buscando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Buscando %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6096,7 +6109,7 @@ msgstr "No se encontró firma"
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de «%s»"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Firma válida"
 
@@ -6105,7 +6118,7 @@ msgstr "Firma válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma válida pero la clave para «%s» no es fiable"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Firma válida (clave no fiable)"
 
@@ -6141,7 +6154,7 @@ msgstr "La firma es válida pero la clave usada ha sido revocada"
 msgid "BAD signature from \"%s\""
 msgstr "Firma INVÁLIDA de «%s»"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Firma INVÁLIDA"
 
@@ -6353,214 +6366,214 @@ msgstr "Queda alguna marca. ¿Procesarla?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 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:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "No."
 
@@ -6569,39 +6582,45 @@ msgstr "No."
 msgid "file %s already exists\n"
 msgstr "el fichero %s ya existe\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6613,7 +6632,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index afc30f25..2be4aeaa 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,55 +435,55 @@ msgstr "Kirja saatmisel tekkis viga\n"
 msgid "Error occurred while sending command\n"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nõutud APOP'i ajatemplit ei leidunud tervituses\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "*Tervituses on ajamärgi süntaksi viga\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokolli viga\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Kustutan aegunud kirja %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Jätan kirja (%d / %d baiti) vahele\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "kirjakast on lukus\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ei suutnud käivitada TLS sessiooni\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Käsklus"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
@@ -513,20 +513,20 @@ msgstr "Kaust"
 msgid "Junk mail filter"
 msgstr "Kaust"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada märgifaili\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1147,7 +1147,7 @@ msgstr "Aadressiraamatu uuendamine"
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1692,156 +1692,169 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "HALB allkiri"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1851,48 +1864,48 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -1957,7 +1970,7 @@ msgstr "Liiguta ülesse"
 msgid "Move Down"
 msgstr "Liiguta alla"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Muuda"
 
@@ -2076,7 +2089,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2527,7 +2540,7 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2587,68 +2600,68 @@ msgstr "Viga LDIF faili lugemisel."
 msgid "LDIF file imported successfully."
 msgstr "LDIF fail sisestati edukalt."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Vali LDIF fail"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Faili Nimi"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF Väli"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Atribuudi nimi"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribuudid"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Vali"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Aadressiraamat :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Faili nimi:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Salvestisi :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Impordi LDIF fail aadressiraamatusse"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Faili-info"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atribuudid"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Soome"
 
@@ -2727,122 +2740,122 @@ msgstr "%s: Uute kirjade võtmine"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -3622,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -3931,25 +3944,25 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5921,17 +5934,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6047,7 +6060,7 @@ msgstr "Tuhnin kaustas %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6250,7 +6263,7 @@ msgstr "Allkirja ei leidunud"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"-lt on hea allkiri"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Hea allkiri"
 
@@ -6259,7 +6272,7 @@ msgstr "Hea allkiri"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6296,7 +6309,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Halb allkiri \"%s\"-lt"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "HALB allkiri"
 
@@ -6516,217 +6529,217 @@ msgstr "Mõned märgid on jäänud. Protsessime selle?"
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Ei."
 
@@ -6735,45 +6748,51 @@ msgstr "Ei."
 msgid "file %s already exists\n"
 msgstr "fail %s on juba olemas\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Loon tekstivaate...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6782,7 +6801,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 688dcd49..bae8bcee 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -443,56 +443,56 @@ msgstr "Erreur lors de l'envoi.\n"
 msgid "Error occurred while sending command\n"
 msgstr "Une erreur est survenue pendant l'envoi de la commande\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Le 'timestamp' APOP n'a pas été reçu\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Erreur de protocole POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "réponse UIDL invalide : %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Suppression du message expiré %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Message ignoré %d (%d octets)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "La boîte aux lettres est verrouillée\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "dépassement du délai de réponse (timeout) de la session\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "échec lors de l'ouverture de la session TLS\n"
 
 #
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "une erreur est survenue pendant la phase d'authentification\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "commande non supportée\n"
 
 #
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
@@ -520,20 +520,20 @@ msgstr "Dossier des messages indésirables"
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1157,7 +1157,7 @@ msgstr "Conversion de carnets d'adresses"
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Aucun"
 
@@ -1589,7 +1589,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1668,152 +1668,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Ajouter la signature"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1822,46 +1835,46 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -1925,7 +1938,7 @@ msgstr "Plus haut"
 msgid "Move Down"
 msgstr "Plus bas"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifier"
 
@@ -2045,7 +2058,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2489,7 +2502,7 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2551,68 +2564,68 @@ msgstr "Erreur lors de la lecture des champs LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Fichier LDIF importé avec succès."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Sélection d'un fichier LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nom du fichier"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Champ LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Attribut"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Carnet d'adresses :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nom de fichier :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Enregistrements :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Suivant"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Propriétés du fichier"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Terminé"
 
@@ -2690,64 +2703,64 @@ msgstr "%s : Récupération des nouveaux messages"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2756,28 +2769,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2786,11 +2799,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2799,15 +2812,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3568,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3895,24 +3908,24 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Commande d'impression par défaut)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5815,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Date"
 
@@ -5941,7 +5954,7 @@ msgstr "Recherche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Recherche %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6141,7 +6154,7 @@ msgstr "Pas de signature trouvée"
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Signature correcte"
 
@@ -6150,7 +6163,7 @@ msgstr "Signature correcte"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Signature correcte mais la clé pour « %s » n'est pas de confiance"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Signature correcte (clé suspecte)"
 
@@ -6188,7 +6201,7 @@ msgstr "La signature est correcte mais la clé de signature a été révoquée"
 msgid "BAD signature from \"%s\""
 msgstr "Mauvaise signature de \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "MAUVAISE signature"
 
@@ -6402,216 +6415,216 @@ msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "N°"
 
@@ -6620,39 +6633,45 @@ msgstr "N°"
 msgid "file %s already exists\n"
 msgstr "le fichier %s existe déjà\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Création de la vue texte...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6664,7 +6683,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index 5159ed3c..e22a529d 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -434,54 +434,54 @@ msgstr "Ocurríu un erro mentras se enviaba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Ocurriu un erro mentras se enviaba o correo."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Non se atopou no saudo a marca temporal APOP requerida\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "a marca temporal do saudo ten un erro de sintaxis\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "linea xover non válida: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Borrando mensaxe expirado %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaxe %d (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "a caixa de correo está bloqueado\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "non podo abrir a sesión TLs\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ocurriu algún erro na autenticación\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "Comando non soportado\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
@@ -510,20 +510,20 @@ msgstr "Carpeta"
 msgid "Junk mail filter"
 msgstr "Carpeta"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1146,7 +1146,7 @@ msgstr "Conversión da axenda"
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ningún"
 
@@ -1614,7 +1614,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1691,155 +1691,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "Sinatura INVÁLIDA"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,48 +1862,48 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -1955,7 +1968,7 @@ msgstr "Arriba"
 msgid "Move Down"
 msgstr "Abaixo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
@@ -2074,7 +2087,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2523,7 +2536,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2583,68 +2596,68 @@ msgstr "Erro lendo os campos LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Ficheiro LDIF importado con éxito."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Seleccionar ficheiro LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nome do ficheiro"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nome de atributo"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Axenda de enderezos :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nome de ficheiro :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Rexistros :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importar ficheiro LDIF na axenda"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Información de ficheiro"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -2723,65 +2736,65 @@ msgstr "%s: Recuperando novas mensaxes"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2790,28 +2803,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2820,12 +2833,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2834,15 +2847,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3621,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -3932,25 +3945,25 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5919,17 +5932,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Data"
 
@@ -6045,7 +6058,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6247,7 +6260,7 @@ msgstr "Non se atopou sinatura"
 msgid "Good signature from \"%s\""
 msgstr "Sinatura válida de \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Sinatura válida"
 
@@ -6256,7 +6269,7 @@ msgstr "Sinatura válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6293,7 +6306,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Sinatura INVÁLIDA"
 
@@ -6513,217 +6526,217 @@ msgstr "Queda algunha marca. ¿Procesa-la?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Non."
 
@@ -6732,45 +6745,51 @@ msgstr "Non."
 msgid "file %s already exists\n"
 msgstr "o ficheiro %s xa existe\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6779,7 +6798,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index acdf883b..a26caa94 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -436,57 +436,57 @@ msgstr "Došlo je do greške prilikom slanja\n"
 msgid "Error occurred while sending command\n"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nužni APOP timestamp nije pronađen u pozdravu\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntax greška u timestampu kod pozdrava\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol greška\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, fuzzy, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "Brišim duplicirane poruke..."
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, fuzzy, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Postavke sandučića"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom ovjeravanja\n"
@@ -516,20 +516,20 @@ msgstr "Spis"
 msgid "Junk mail filter"
 msgstr "Spis"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilježenu datoteku\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1143,7 +1143,7 @@ msgstr "Unos adresara"
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ništa"
 
@@ -1624,7 +1624,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1698,158 +1698,171 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,49 +1872,49 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -1966,7 +1979,7 @@ msgstr "Pomakni gore"
 msgid "Move Down"
 msgstr "Pomakni dolje"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Promjeni"
 
@@ -2085,7 +2098,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2541,7 +2554,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2604,77 +2617,77 @@ msgstr "Greška pri unosu LDIF datoteke."
 msgid "LDIF file imported successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Odaberite LDIF datoteku"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 #, fuzzy
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr ""
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 #, fuzzy
 msgid "LDIF Field"
 msgstr "Odaberite LDIF datoteku"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 #, fuzzy
 msgid "Attribute Name"
 msgstr "Atributi korisnika"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 #, fuzzy
 msgid "Attribute"
 msgstr "Atributi korisnika"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Odaberi"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 #, fuzzy
 msgid "Address Book :"
 msgstr "Adresar"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 #, fuzzy
 msgid "File Name :"
 msgstr "Ime datoteke"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr ""
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Unesi LDIF datoteku u Adresar"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 #, fuzzy
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Slijedeća"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 #, fuzzy
 msgid "File Info"
 msgstr "Ime datoteke"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 #, fuzzy
 msgid "Attributes"
 msgstr "Atributi korisnika"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr ""
 
@@ -2756,124 +2769,124 @@ msgstr "%s: Primam nove poruke"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -3719,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4034,25 +4047,25 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6017,17 +6030,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -6144,7 +6157,7 @@ msgstr "Pretražujem spis %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6350,7 +6363,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -6359,7 +6372,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6396,7 +6409,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -6625,221 +6638,221 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Ne."
 
@@ -6848,44 +6861,50 @@ msgstr "Ne."
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Kreiram pregled teksta...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6894,7 +6913,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 52a8f6dd..7df254f5 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,54 +435,54 @@ msgstr "Hiba küldés közben\n"
 msgid "Error occurred while sending command\n"
 msgstr "Hiba történt parancsküldés közben\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "A szükséges APOP időpecsét nem található az üdvözletben\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Időpecsét szintaktikai hiba az üdvözletben\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokollhiba\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "érvénytelen UIDL válasz: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Lejárt üzenetek törlése %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: üzenet átugrása %d (%d bájt)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "a postafiók zárolt\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "kapcsolat időtúllépése\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nem lehet TLS menetet indítani\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Hiba történt az azonosításkor\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "A parancs nem támogatott\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
@@ -510,20 +510,20 @@ msgstr "Levélszemét szűrő"
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrő"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "A kijelölt fájl nem nyitható meg\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d üzenet vétele nem sikerült\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1142,7 +1142,7 @@ msgstr "Címjegyzék konverzió"
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Semmi"
 
@@ -1572,7 +1572,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1652,152 +1652,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem lehet eltávolítani\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 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:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Aláírás csatolása"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,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:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -1907,7 +1920,7 @@ msgstr "Mozgatás fel"
 msgid "Move Down"
 msgstr "Mozgatás le"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Módosít"
 
@@ -2026,7 +2039,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2468,7 +2481,7 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2528,68 +2541,68 @@ msgstr "Hiba az LDIF mezők olvasásakor."
 msgid "LDIF file imported successfully."
 msgstr "LDIF fájl importálása sikerült."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "LDIF fájl választás"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Fájlnév"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF mező"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Tulajdonság név"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Tulajdonság"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Választ"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Címjegyzék:"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Fájlnév:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Rekordok:"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "LDIF fájl importálása a címjegyzékbe"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Következő"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Fájl információ"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Tulajdonságok"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Vége"
 
@@ -2667,64 +2680,64 @@ msgstr "%s: Új üzenetek fogadása"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s üzeneteinek fogadása..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új üzenetek számának megszerzése (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új üzenetek számának megszerzése (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új üzenetek számának megszerzése (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új üzenetek méretének megszerzése (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d üzenet törlése"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Üzenet vétele (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Üzenetek fogadása (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2733,28 +2746,28 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2763,11 +2776,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2776,15 +2789,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új üzeneteinek megszerzése %s mappába...\n"
@@ -3536,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3862,24 +3875,24 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5781,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Dátum"
 
@@ -5906,7 +5919,7 @@ msgstr "%s keresése..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6106,7 +6119,7 @@ msgstr "Nem található digitális aláírás"
 msgid "Good signature from \"%s\""
 msgstr "Jó digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Jó digitális aláírás"
 
@@ -6115,7 +6128,7 @@ msgstr "Jó digitális aláírás"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Érvényes aláírás, de a(z) \"%s\" kulcs nem megbízható"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Érvényes aláírás (megbízhatatlan kulcs)"
 
@@ -6151,7 +6164,7 @@ msgstr "Érvényes aláírás, de az aláíró kulcs vissza lett vonva"
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "ROSSZ digitális aláírás"
 
@@ -6365,214 +6378,214 @@ msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan üzenet"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Nincs olvasatlan üzenet.."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem található olvasatlan üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Nincs több új üzenet"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nem található új üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt üzenet"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett üzenet."
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 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:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Db"
 
@@ -6581,39 +6594,45 @@ msgstr "Db"
 msgid "file %s already exists\n"
 msgstr "%s fájl már létezik\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Szövegnézet létrehozása...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Ez az üzenet nem jeleníthető meg.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Ú_j üzenet szerkesztése"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6625,7 +6644,7 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
diff --git a/po/it.po b/po/it.po
index 50c4cfaf..90d5566a 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,54 +435,54 @@ msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
 msgid "Error occurred while sending command\n"
 msgstr "Si è verificato un errore durante l'invio del comando\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nel saluto non è stata trovata la necessaria data/ora APOP\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Errore di sintassi nella data/ora del saluto\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Errore nel protocollo POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "risposta UIDL non valida: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Eliminazione del messaggio scaduto %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Salto il messaggio %d (%d byte)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "la casella postale è bloccata\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "timeout della sessione \n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "impossibile avviare la sessione TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "si è verificato un errore durante l'autenticazione\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "comando non supportato\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
@@ -510,20 +510,20 @@ msgstr "Filtro mail spazzatura"
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1146,7 +1146,7 @@ msgstr "Conversione della rubrica"
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Niente"
 
@@ -1575,7 +1575,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1658,152 +1658,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Aggiunge la firma"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,44 +1825,44 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -1913,7 +1926,7 @@ msgstr "Sposta su"
 msgid "Move Down"
 msgstr "Sposta giù"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifica"
 
@@ -2033,7 +2046,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2476,7 +2489,7 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2536,68 +2549,68 @@ msgstr "Errore leggendo i campi LDIF."
 msgid "LDIF file imported successfully."
 msgstr "File LDIF importato con successo."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Seleziona il file LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nome del file"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nome dell'attributo"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Attibuto"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Rubrica :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nome del file:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Record :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importazione del file LDIF nella rubrica"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Successivo"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Info sul file"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Attibuti"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Fine"
 
@@ -2675,64 +2688,64 @@ msgstr "%s: Recupero i nuovi messaggi"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2741,28 +2754,28 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2771,11 +2784,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2784,15 +2797,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3544,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3870,24 +3883,24 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5790,17 +5803,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Data"
 
@@ -5916,7 +5929,7 @@ msgstr "Ricerca in %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ricerca in %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6116,7 +6129,7 @@ msgstr "Firma non trovata"
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da «%s»"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Firma corretta"
 
@@ -6125,7 +6138,7 @@ msgstr "Firma corretta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma valida, ma la chiave per «%s» non è fidata"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Firma valida (chiave non fidata)"
 
@@ -6161,7 +6174,7 @@ msgstr "Firma valida, ma la firma della chiave è stata revocata"
 msgid "BAD signature from \"%s\""
 msgstr "Firma DIFETTOSA da «%s»"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Firma DIFETTOSA"
 
@@ -6373,216 +6386,216 @@ msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "No."
 
@@ -6591,39 +6604,45 @@ msgstr "No."
 msgid "file %s already exists\n"
 msgstr "il file %s esiste già\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Creazione della vista del testo...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Componi un n_uovo messaggio"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6636,7 +6655,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index e8a15c07..300de1df 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -434,54 +434,54 @@ msgstr "ポスト中にエラーが発生しました\n"
 msgid "Error occurred while sending command\n"
 msgstr "コマンドの送信中にエラーが発生しました\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "必要なAPOPタイムスタンプが応答メッセージにありません\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "応答メッセージのタイムスタンプの文法エラー\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 プロトコルエラー\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無効な UIDL 応答です: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 期限切れのメッセージ %d を削除します\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: メッセージ %d をスキップします (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "メールボックスはロックされています\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "セッションがタイムアウトしました\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS セッションを開始できません\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "認証中にエラーが発生しました\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "コマンドがサポートされていません\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 セッション中にエラーが発生しました\n"
 
@@ -508,20 +508,20 @@ msgstr "迷惑メールフィルタ (手動)"
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "マークファイルを開けません\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -1139,7 +1139,7 @@ msgstr "アドレス帳変換"
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "アドレス帳"
 
@@ -1181,7 +1181,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "なし"
 
@@ -1568,7 +1568,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1647,152 +1647,170 @@ msgstr ""
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr "Bcc を伴う暗号化"
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+"このメッセージは宛先に Bcc が使用されています。このメッセージを暗号化した場"
+"合、暗号化鍵リストを調べることですべての Bcc の宛先が見えてしまい、機密性を失"
+"うことになります。\n"
+"\n"
+"とにかく送信しますか?"
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "ファイルを添付"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "署名を追加"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,44 +1819,44 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -1902,7 +1920,7 @@ msgstr "上に移動"
 msgid "Move Down"
 msgstr "下に移動"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "変更"
 
@@ -2021,7 +2039,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2462,7 +2480,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2522,68 +2540,68 @@ msgstr "LDIFファイルの読み込み中にエラーが発生しました。"
 msgid "LDIF file imported successfully."
 msgstr "LDIFファイルは正しく変換されました。"
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "LDIFファイルの選択"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "ファイル名"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIFフィールド"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "属性名"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "属性"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "選択"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "アドレス帳 :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "ファイル名 :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "レコード :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "LDIFファイルをアドレス帳へインポート"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "次へ"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "ファイル情報"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "属性"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "完了"
 
@@ -2661,64 +2679,64 @@ msgstr "%s: 新着メッセージを受信中"
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2727,28 +2745,28 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2757,11 +2775,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2770,15 +2788,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -3528,8 +3546,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3852,24 +3870,24 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5760,17 +5778,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "日付"
 
@@ -5885,7 +5903,7 @@ msgstr "%s を検索中..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6085,7 +6103,7 @@ msgstr "署名がありません"
 msgid "Good signature from \"%s\""
 msgstr "差出人 \"%s\" の正当な署名"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "正当な署名"
 
@@ -6094,7 +6112,7 @@ msgstr "正当な署名"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "有効な署名ですが \"%s\" の鍵は信用されていません"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "有効な署名 (信用されていない鍵)"
 
@@ -6130,7 +6148,7 @@ msgstr "署名は有効ですが署名鍵が失効しています"
 msgid "BAD signature from \"%s\""
 msgstr "差出人 \"%s\" の不正な署名"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "不正な署名"
 
@@ -6342,214 +6360,214 @@ msgstr "マークが残っています。処理しますか?"
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "未読メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "新着メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "番号"
 
@@ -6558,39 +6576,47 @@ msgstr "番号"
 msgid "file %s already exists\n"
 msgstr "ファイル %s はすでに存在します\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "テキストビューを作成中...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "このメッセージは表示できません。\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+"一時ファイルへの書き込みが失敗したため、このメッセージ本文は表示できませんで"
+"した。\n"
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "アドレス帳に追加(_B)..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "アドレスをコピー(_R)"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Webブラウザで開く(_O)"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "リンクをコピー(_L)"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6603,7 +6629,7 @@ msgstr ""
 "\n"
 "とにかく開きますか?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
 
diff --git a/po/ko.po b/po/ko.po
index 9db5e36f..1940f0f3 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,55 +435,55 @@ msgstr "글을 올리는 도중 에러 발생\n"
 msgid "Error occurred while sending command\n"
 msgstr "메일을 처리하는 도중 에러"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting에서 발견되지않은 APOP 타임 스탬프가 요구됨\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting에서 타임 스탬프에 문법 오류\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 프로토콜 에러\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "올바르지않은 xover line: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 만료된 메시지 %d를 삭제합니다\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 메시지 %d를 건너뜁니다 (%d 바이트)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "우편함이 잠겨있습니다\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS 세션을 시작할 수 없습니다\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "인증 도중 에러 발생\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "명령어"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "인증 도중 에러 발생\n"
@@ -513,20 +513,20 @@ msgstr "폴더"
 msgid "Junk mail filter"
 msgstr "폴더"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "표시 파일을 열수가 없습니다\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "주소록"
 
@@ -1130,7 +1130,7 @@ msgstr "주소록 변환"
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "주소록"
 
@@ -1172,7 +1172,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "없음"
 
@@ -1598,7 +1598,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1674,156 +1674,169 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "파일 첨부"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "BAD signature"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1833,48 +1846,48 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -1939,7 +1952,7 @@ msgstr "위로 이동"
 msgid "Move Down"
 msgstr "아래로 이동"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "수정"
 
@@ -2058,7 +2071,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2506,7 +2519,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2566,68 +2579,68 @@ msgstr "LDIF field를 읽다가 에러가 발생했습니다."
 msgid "LDIF file imported successfully."
 msgstr "LDIF 파일을 성공적으로 가져왔습니다."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "LDIF 파일 선택"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "파일 이름"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF Field"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "속성 이름"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "속성"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "선택"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "주소록 :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "파일 이름 :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr ""
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "LDIF 파일을 주소록으로 가져오기"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "다음"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "파일 정보"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "속성"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr ""
 
@@ -2705,120 +2718,120 @@ msgstr "%s: 새 메시지를 가져옴"
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -3595,8 +3608,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3905,25 +3918,25 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5869,17 +5882,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "날짜"
 
@@ -5993,7 +6006,7 @@ msgstr "%s 폴더를 스캔합니다..."
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6193,7 +6206,7 @@ msgstr "서명이 발견되지않음"
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Good signature"
 
@@ -6202,7 +6215,7 @@ msgstr "Good signature"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6238,7 +6251,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "BAD signature"
 
@@ -6458,217 +6471,217 @@ msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "번호"
 
@@ -6677,45 +6690,51 @@ msgstr "번호"
 msgid "file %s already exists\n"
 msgstr "%s 파일이 이미 존재합니다\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "텍스트 뷰를 생성합니다...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6724,7 +6743,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 177b8c36..03eda783 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -434,54 +434,54 @@ msgstr "Klaida skelbiant žinutę\n"
 msgid "Error occurred while sending command\n"
 msgstr "Klaida siunčiant komandą\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Reikalinga APOP žyma nerasta pasisveikinime\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Sintaksės klaida pasisveikinime\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokolo klaida\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "blogas UIDL atsakymas: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Trinamas senas laiškas %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: praleidžiamas laiškas %d (%d B)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "dėžutė užrakinta\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "baigėsi sesijai skirtas laikas\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "negaliu pradėti TLS sesijos\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "klaida tikrinant autentiškumą\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "komanda nepalaikoma\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "klaida POP3 sesijoje\n"
 
@@ -509,20 +509,20 @@ msgstr "Nereikalingo pašto filtras"
 msgid "Junk mail filter"
 msgstr "Nereikalingo pašto filtras"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "negali atidaryti žymų failo\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti laiško %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1137,7 +1137,7 @@ msgstr "Adresų knygos konvertavimas"
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Nieko"
 
@@ -1567,7 +1567,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1646,152 +1646,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Siųsti laišką"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Įterpti failą"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Prisegti failą"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Pridėti parašą"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redaktorius"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1800,44 +1813,44 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1901,7 +1914,7 @@ msgstr "Aukštyn"
 msgid "Move Down"
 msgstr "Žemyn"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Taisyti"
 
@@ -2020,7 +2033,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2461,7 +2474,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2521,68 +2534,68 @@ msgstr "Klaida skaitant LDIF laukus."
 msgid "LDIF file imported successfully."
 msgstr "LDIF failas importuota sėkmingai."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Pasirinkite LDIF failą"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Failo vardas"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF Laukas"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Atributo vardas"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atributas"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Pasirinkti"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adresų knyga :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Failo vardas :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Įrašai :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importuoti LDIF failą į adresų knygą"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Kitas"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Failo informacija"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributai"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Baigti"
 
@@ -2660,64 +2673,64 @@ msgstr "%s: gaunami nauji laiškai"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti laiškai: %d (%s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2726,28 +2739,28 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2756,11 +2769,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2769,15 +2782,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -3528,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3853,24 +3866,24 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr "Laiškas bus atspausdintas naudojant komandą:"
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Numatytoji spausdinimo komanda)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5762,17 +5775,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Data"
 
@@ -5887,7 +5900,7 @@ msgstr "Ieškoma „%s“..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ieškoma %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6087,7 +6100,7 @@ msgstr "Parašas nerastas"
 msgid "Good signature from \"%s\""
 msgstr "Geras parašas nuo „%s“"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Geras parašas"
 
@@ -6096,7 +6109,7 @@ msgstr "Geras parašas"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geras parašas, bet „%s“ raktas nėra patikimas"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Geras parašas (nepatikimas raktas)"
 
@@ -6132,7 +6145,7 @@ msgstr "Parašas geras, bet raktas buvo pakeistas"
 msgid "BAD signature from \"%s\""
 msgstr "BLOGAS „%s“ parašas"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "BLOGAS parašas"
 
@@ -6346,214 +6359,214 @@ msgstr "Palikta žymių. Vykdyti jas?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nėra neskaitytų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų laiškų."
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Nėra naujų laiškų."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nėra naujų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų laiškų"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Nėra pažymėtų laiškų."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Daugiau nėra laiškų su etiketėmis"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Nėra laiškų su etiketėmis."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Laiškai pritraukiami pagal temą..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr."
 
@@ -6562,39 +6575,45 @@ msgstr "Nr."
 msgid "file %s already exists\n"
 msgstr "failas %s jau egzistuoja\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Sukuriama teksto peržiūra...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Laiškas negali būti parodytas.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6607,7 +6626,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index d11cd678..7428a715 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -439,54 +439,54 @@ msgstr "Er is een fout opgetreden bij het versturen\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fout opgetreden bij sturen van de opdracht\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Er is geen APOP timestamp gevonden in de begroeting\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "APOP Timestamp in de begroeting is ongeldig\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protocolfout\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Ongeldige UIDL-reactie: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Bezig met verwijderen van verlopen bericht %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Bericht %d wordt overgeslagen (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "postbusis vergrendeld\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "sessie time-out\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "Kan TLS sessie niet starten\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de identificatie\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "opdracht niet ondersteund\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
@@ -514,20 +514,20 @@ msgstr "Troepfilter"
 msgid "Junk mail filter"
 msgstr "Troepfilter"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Adrukopdracht is ongeldig: '%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1148,7 +1148,7 @@ msgstr "Adresboek Omzetting"
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Geen"
 
@@ -1578,7 +1578,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1657,152 +1657,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Handtekening toevoegen"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,44 +1824,44 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -1912,7 +1925,7 @@ msgstr "Omhoog"
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Bewerken"
 
@@ -2032,7 +2045,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr "Bladeren..."
@@ -2475,7 +2488,7 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2536,68 +2549,68 @@ msgstr "Fout bij lezen LDIF velden."
 msgid "LDIF file imported successfully."
 msgstr "LDIF bestand succesvol geïmporteerd."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Selecteer LDIF bestand"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF Veld"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Attribuutnaam"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Selecteer"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adresboek :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Bestandsnaam :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Kaarten :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importeer LDIF bestand in het adresboek"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Volgende"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Bestandsinfo"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Attributen"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Afronden"
 
@@ -2675,64 +2688,64 @@ msgstr "%s: Nieuwe berichten worden opgehaald"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ophalen (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2741,29 +2754,29 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2772,11 +2785,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2785,15 +2798,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3547,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3877,24 +3890,24 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Standaard afdrukopdracht)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5797,17 +5810,17 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -5923,7 +5936,7 @@ msgstr "Doorzoeken van %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Doorzoeken van %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6123,7 +6136,7 @@ msgstr "Geen hadtekening gevonden"
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde handtekening van \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Correcte handtekening"
 
@@ -6132,7 +6145,7 @@ msgstr "Correcte handtekening"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" wordt niet vertrouwd"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Geldige ondertekening (onbetrouwbare sleutel)"
 
@@ -6168,7 +6181,7 @@ msgstr "Geldige ondertekening maar de sleutel is verlopen"
 msgid "BAD signature from \"%s\""
 msgstr "SLECHTE handtekening van \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "FOUTIEVE handtekening"
 
@@ -6382,215 +6395,215 @@ msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Opnieuw zoeken"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, 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:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr."
 
@@ -6599,39 +6612,45 @@ msgstr "Nr."
 msgid "file %s already exists\n"
 msgstr "bestand %s bestaat al\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Tekstvenster wordt aangemaakt...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Dit bericht kan niet worden weergegeven.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Afbeelding opslaan _als..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "_Nieuw bericht opstellen"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "_Adres kopiëren"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Openen met webbrowser"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "_Link kopiëren"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6644,7 +6663,7 @@ msgstr ""
 "\n"
 "Wilt u het toch openen?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Waarschuwing! Misleidende link"
 
diff --git a/po/pl.po b/po/pl.po
index 112a11f0..badc7eeb 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -428,54 +428,54 @@ msgstr "Wystąpił błąd podczas publikowania\n"
 msgid "Error occurred while sending command\n"
 msgstr "Błąd podczas wysyłania polecenia\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Przy powitaniu zabrakło wymaganego znacznika czasowego APOP\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Błąd składni przy znaczniku czasowym powitania\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Błąd protokołu POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Usuwanie przestarzałej wiadomości %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pomijanie wiadomości %d (%d bajtów)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "skrzynka jest zablokowana\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "przekroczenie czasu sesji\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nie można uruchomić sesji TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "nieobsługiwane polecenie\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
@@ -504,20 +504,20 @@ msgstr "Niechciana poczta"
 msgid "Junk mail filter"
 msgstr "Niechciana poczta"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "nie można otworzyć pliku zaznaczeń\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -1143,7 +1143,7 @@ msgstr "Konwersja książki adresowej"
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Brak"
 
@@ -1578,7 +1578,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1655,153 +1655,166 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Dołącz plik"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "ZŁY podpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,47 +1824,47 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -1916,7 +1929,7 @@ msgstr "W górę"
 msgid "Move Down"
 msgstr "W dół"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Zmień"
 
@@ -2035,7 +2048,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2480,7 +2493,7 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2540,68 +2553,68 @@ msgstr "Błąd przy odczycie pól LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Plik LDIF został pomyślnie zaimportowany."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Wybierz plik LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Pole LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nazwa atrybutu"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atrybut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Książka adresowa :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nazwa pliku :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Rekordy :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importuj plik LDIF do książki adresowej"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Następna"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Informacja o pliku"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atrybuty"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Koniec"
 
@@ -2679,64 +2692,64 @@ msgstr "%s : Pobieranie nowych wiadomości"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2745,28 +2758,28 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2775,11 +2788,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2788,15 +2801,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -3547,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3854,25 +3867,25 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5802,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Data"
 
@@ -5928,7 +5941,7 @@ msgstr "Przeszukiwanie katalogu %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6128,7 +6141,7 @@ msgstr "Nie znaleziono podpisu"
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Poprawny podpis"
 
@@ -6137,7 +6150,7 @@ msgstr "Poprawny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6173,7 +6186,7 @@ msgstr "Podpis poprawny, ale klucz został unieważniony"
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "ZŁY podpis"
 
@@ -6398,231 +6411,231 @@ msgstr "brak niektórych znaczników, czy wykonać ?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr"
 
@@ -6631,43 +6644,49 @@ msgstr "Nr"
 msgid "file %s already exists\n"
 msgstr "plik %s już istnieje\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Tworzenie widoku tekstowego...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6676,7 +6695,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 43dfec27..f7afe311 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-06 17:22+0900\n"
-"PO-Revision-Date: 2006-09-05 12:15-0300\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
 "MIME-Version: 1.0\n"
@@ -442,54 +442,54 @@ msgstr "Ocorreu um erro quando postando\n"
 msgid "Error occurred while sending command\n"
 msgstr "Erro ao enviar comando\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Timestamp APOP requerida não encontrada no greeting\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe no greeting\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "resposta UIDL inválida: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Apagando mensagem expirada %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pulando mensagem %d (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "a caixa de correio está travada\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "tempo limite da sessão\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "não foi possível iniciar sessão TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "comando não suportado\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "Erro na sessão POP3\n"
 
@@ -516,20 +516,20 @@ msgstr "Filtro de spam (manual)"
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "não foi possível abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "não posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impressão é inválido: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1147,7 +1147,7 @@ msgstr "Conversão do Catálogo de Endereços"
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1576,7 +1576,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1656,152 +1656,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Apender assinatura"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,44 +1823,44 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -1911,7 +1924,7 @@ msgstr "Mover para cima"
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modificar"
 
@@ -2031,7 +2044,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2474,7 +2487,7 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2535,68 +2548,68 @@ msgstr "Erro lendo campos do LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Arquivo LDIF importado com sucesso."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Selecione arquivo LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nome do arquivo"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nome do Atributo"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Selecione"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Livro de Endereços :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nome do arquivo :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Registros :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importar arquivo LDIF para o Livro de Endereços"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Próxima"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Informação do Arquivo"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributos"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Terminar"
 
@@ -2674,64 +2687,64 @@ msgstr "%s: Recuperando novas mensagens"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2740,28 +2753,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2770,11 +2783,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2783,15 +2796,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -3263,7 +3276,6 @@ msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
 #: src/mainwindow.c:710 src/messageview.c:247 src/summaryview.c:459
-#, fuzzy
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
@@ -3543,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3869,24 +3881,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, 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:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5784,17 +5796,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Data"
 
@@ -5910,7 +5922,7 @@ msgstr "Procurando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6110,7 +6122,7 @@ msgstr "Assinatura não encontrada"
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Assinatura correta"
 
@@ -6119,7 +6131,7 @@ msgstr "Assinatura correta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Assinatura válida mas a chave para \"%s\" não é confiável"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Assinatura válida (chave desconfiável)"
 
@@ -6155,7 +6167,7 @@ msgstr "Assinatura válida mas a chave foi revogada"
 msgid "BAD signature from \"%s\""
 msgstr "Assimanatura ERRADA de \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Assinatura ERRADA"
 
@@ -6367,214 +6379,214 @@ msgstr "Algumas marcas foram deixadas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nº"
 
@@ -6583,39 +6595,45 @@ msgstr "Nº"
 msgid "file %s already exists\n"
 msgstr "arquivo %s já existe\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Criando visualização do texto...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Esta mensagem não pode ser exibida.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6628,7 +6646,7 @@ msgstr ""
 "\n"
 "Abrí-la mesmo assim?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/ro.po b/po/ro.po
index 3be9d402..80353552 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+0900\n"
 "PO-Revision-Date: 2006-04-17 02:04+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -444,55 +444,55 @@ msgid "Error occurred while sending command\n"
 msgstr "A avut loc o eroare în timpul trimiterii comenzii\n"
 
 # hm ? greting ?
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nu s-a găsit în salut marcajul de timp APOP necesar \n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Eroare de sintaxă timestamp\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Eroare protocol POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "răspuns UIDL invalid: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Ştergere mesaje expirate %d\n"
 
 # hm ? sau săritură ?
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "PO3:  Trecere peste mesajul %d (%d bytes)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "căsuţa poştală este blocată\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "timpul sesiunii a expirat\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nu se poate porni sesiunea TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "a avut loc o eroare la autentificare\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "comandă nesuportată\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "a avut loc o eroare la sesiunea POP3\n"
 
@@ -520,20 +520,20 @@ msgstr "Filtru spam"
 msgid "Junk mail filter"
 msgstr "Filtru spam"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): conversia codului a eşuat.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "nu se poate deschide fişierul de marcaj\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nu se poate verifica mesajul %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1166,7 +1166,7 @@ msgstr "Conversie agendă"
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Nimic"
 
@@ -1598,7 +1598,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obţine o parte a mesajului multiparte."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1680,154 +1680,167 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "nu se poate şterge mesajul vechi\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de aşteptare...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de aşteptare\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Dimensiune"
 
 # obs: comun şi pentru butonul din toolbar şi pentru tab-ul din common preferences şi edit accounts
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Trimite"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Trimite acum"
 
 # hm ? sau trimite mai târziu ?
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Pune în coada de aşteptare şi trimite mai târziu"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Ciornă"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Salvează în folderul de ciorne"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Iserează fişier"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Ataşează"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Ataşează fişier"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Adaugă semnătură"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Desparte liniile"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Nume fişier"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1836,44 +1849,44 @@ msgstr ""
 "Editorul extern este încă în funcţiune.\n"
 "Forţaţi terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de aşteptare."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Selectează fişiere"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Selectează fişier"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriţi să aplicaţi şablonul '%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Aplică şablon"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "Înl_ocuieşte"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -1937,7 +1950,7 @@ msgstr "Mută sus"
 msgid "Move Down"
 msgstr "Mută jos"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Modifică"
 
@@ -2057,7 +2070,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editează înregistrare JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2506,7 +2519,7 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere header...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -2570,71 +2583,71 @@ msgstr "Eroare la citirea câmpurilor LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Fişier LDIF importat cu succes."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Selectează fişier LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Nume Fişier"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Câmp LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Nume atribut"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Selectează"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Agendă:"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Nume Fişier:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Înregistrări:"
 
 # hm ? asta e comandă sau înştiinţare ?
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importă fişier LDIF în agendă"
 
 # hm ? sau anterior ? sau  înapoi ?
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Precedent"
 
 # hm ? sau înainte ?
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Următor"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Informaţii despre Fişier"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atribute"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Terminat"
 
@@ -2712,65 +2725,65 @@ msgstr "%s: recepţionare mesaje noi"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepţionare mesaje de la %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obţinerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obţinerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obţinerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obţinerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ştergere mesaje %d"
 
 # hm ?
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Închidere conexiune"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recepţionare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "A avut loc o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2779,28 +2792,28 @@ msgstr ""
 "A avut loc o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nu mai este spaţiu pe disc."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Nu se poate scrie fişierul."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanţă."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Căsuţa poştală este blocată"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2809,11 +2822,11 @@ msgstr ""
 "Căsuţa poştală este blocată:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Autentificare eşuată."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2822,16 +2835,16 @@ msgstr ""
 "Autentificare eşuată:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
 # ???
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Încorporare anulată\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obţinere mesaje noi de la %s în %s...\n"
@@ -3594,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3932,25 +3945,25 @@ msgstr "Ataşamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, 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:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Comandă de imprimare predefinită)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5880,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Dată"
 
@@ -6007,7 +6020,7 @@ msgstr "Căutare %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Căutare %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6211,7 +6224,7 @@ msgstr "Nu s-a găsit semnătura"
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună de la \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Semnătură bună"
 
@@ -6220,7 +6233,7 @@ msgstr "Semnătură bună"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Semnătură validă, dar cheia pentru \"%s\" nu este de încredere"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Semnătură validă (cheia nu este de încredere)"
 
@@ -6256,7 +6269,7 @@ msgstr "Semnătură validă, dar cheia de semnătură a fost revocată"
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură BAD de la \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Semnătură BAD"
 
@@ -6474,214 +6487,214 @@ msgstr "Au mai rămas nişte marcaje. Doriţi să fie procesate ?"
 msgid "Scanning folder (%s)..."
 msgstr "Scanare folder (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Caută din nou"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nu mai există mesaje necitite"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Nu există mesaje necitite."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Mergeţi la folderul următor ?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Nu mai există mesaje noi"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj nou. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Nu există mesaje noi."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj nou. Mergeţi la folderul următor ?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nu mai există mesaje marcate"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Nu există mesaje marcate."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutaţi de la început ?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nu mai există mesaje etichetate"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj etichetat. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Nu există mesaje etichetate"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaje etichetat. Căutaţi de la început ?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Atracţie mesaje după subiect..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d şters(e)"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mutat(e)"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat(e)"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " elemente selectate"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tSetare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Setare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj(e)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia pentru copiere este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nu."
 
@@ -6690,40 +6703,46 @@ msgstr "Nu."
 msgid "file %s already exists\n"
 msgstr "fişierul %s există deja\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Creare vizualizare text...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Acest mesaj nu poate fi afişat.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Sal_vează acestă imagine ca..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Compune mesaj _nou"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Adăugă în a_gendă..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Copiază această ad_resă"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Deschide cu browser Web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Copiază această _legătură"
 
 # !!! de verificat cum arată practic !!!
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6736,7 +6755,7 @@ msgstr ""
 "\n"
 "Îl deschid oricum ?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Avertizare de URL fals"
 
diff --git a/po/ru.po b/po/ru.po
index 49468d26..db4437d7 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -437,54 +437,54 @@ msgstr "Произошла ошибка при отправке статьи\n"
 msgid "Error occurred while sending command\n"
 msgstr "Произошла ошибка при передаче команды.\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В сообщении сервера не найдена требуемая метка времени APOP\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Ошибка синтаксиса метки времени в сообщении сервера\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Ошибка протокола POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "неверный ответ UIDL: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Удаление устаревшего сообщения %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропускается сообщение %d (%d байт)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик занят\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "время сеанса истекло\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "не удалось начать сеанс TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ошибка при аутентификации\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "ошибка сеанса POP3\n"
 
@@ -512,20 +512,20 @@ msgstr "Фильтр спама"
 msgid "Junk mail filter"
 msgstr "Фильтр спама"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "ошибка открытия файла пометок\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: \"%s\"\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1145,7 +1145,7 @@ msgstr "Преобразование адресной книги"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресная книга"
 
@@ -1187,7 +1187,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Нет"
 
@@ -1575,7 +1575,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1654,152 +1654,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Вложить файл"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Добавить подпись"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1809,44 +1822,44 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -1910,7 +1923,7 @@ msgstr "Вверх"
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Изменить"
 
@@ -2029,7 +2042,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2472,7 +2485,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2532,68 +2545,68 @@ msgstr "Ошибка при чтении полей LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Файл LDIF успешно импортирован."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Выбор файла LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Имя файла"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "В"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Поле LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Атрибут"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Адресная книга:"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Имя файла:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Записей:"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Импорт файла LDIF в адресную книгу"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Далее"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Информация о файле"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Завершение"
 
@@ -2671,64 +2684,64 @@ msgstr "%s: Получение новых сообщений"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Приём (принято сообщений: %d (%s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2737,28 +2750,28 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2767,11 +2780,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2780,15 +2793,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -3539,8 +3552,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3866,24 +3879,24 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr "Сообщение будет напечатано с помощью следующей команды:"
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Команда печати по умолчанию)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5783,17 +5796,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Дата"
 
@@ -5909,7 +5922,7 @@ msgstr "Поиск в папке \"%s\"..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Поиск в папке \"%s\" (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6109,7 +6122,7 @@ msgstr "Подпись не найдена"
 msgid "Good signature from \"%s\""
 msgstr "Хорошая подпись от \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Хорошая подпись"
 
@@ -6118,7 +6131,7 @@ msgstr "Хорошая подпись"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпись от \"%s\" правильная, но нет доверия ключу"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Подпись правильная, но нет доверия ключу"
 
@@ -6154,7 +6167,7 @@ msgstr "Подпись правильная, но ключ был отозван
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись  от \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "ПЛОХАЯ подпись"
 
@@ -6368,214 +6381,214 @@ msgstr "Несколько меток осталось. Обработать и�
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Номер"
 
@@ -6584,39 +6597,45 @@ msgstr "Номер"
 msgid "file %s already exists\n"
 msgstr "файл %s уже существует\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Создание области просмотра текста...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Сохранить изображение как..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Добавить в адресную книгу"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Копировать адрес"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Открыть в браузере"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Копировать ссылку"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6629,7 +6648,7 @@ msgstr ""
 "\n"
 "Всё равно открыть?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Внимание - подмена URL"
 
diff --git a/po/sk.po b/po/sk.po
index 5269d595..cf6c694c 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -432,54 +432,54 @@ msgstr "Pri odosielaní sa vyskytla chyba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdrave nebola nájdená vyžadovaná APOP časová značka\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Chybná časová značka v pozdrave\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Chyba protokolu POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Odstraňujem starú správu %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakujem správu %d (%d bajtov)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "mailbox je zamknutý\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "čas spojenia vypršal\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "nemôžem vytvoriť TLS reláciu\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "vyskytla sa chyba v autentizácii\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
@@ -508,20 +508,20 @@ msgstr "Priečinok"
 msgid "Junk mail filter"
 msgstr "Priečinok"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "nemôžem otvoriť súbor so značkami\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -1144,7 +1144,7 @@ msgstr "Konverzia adresára"
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "Adresár"
 
@@ -1186,7 +1186,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Žiadna"
 
@@ -1611,7 +1611,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1688,155 +1688,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "CHYBNÝ podpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1846,48 +1859,48 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -1952,7 +1965,7 @@ msgstr "Posunúť nahor"
 msgid "Move Down"
 msgstr "Posunúť nadol"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Zmeniť"
 
@@ -2072,7 +2085,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2520,7 +2533,7 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2580,68 +2593,68 @@ msgstr "Chyba pri čítaní LDIF polí."
 msgid "LDIF file imported successfully."
 msgstr "Súbor LDIFbol úspešne importovaný."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Zvoľte súbor LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Názov súboru"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF pole"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Názov atribútu"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribút"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Zvoľte"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adresár :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Názov súboru :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Záznamy:"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importovať súbor LDIF do adresára"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Údaje o súbore"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atribúty"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Dokončiť"
 
@@ -2720,64 +2733,64 @@ msgstr "%s: Prijímam nové správy"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2786,28 +2799,28 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2816,11 +2829,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2829,16 +2842,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -3612,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3923,25 +3936,25 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5914,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Dátum"
 
@@ -6041,7 +6054,7 @@ msgstr "Prehľadávam priečinok %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6242,7 +6255,7 @@ msgstr "Nebol nájdený žiadny podpis"
 msgid "Good signature from \"%s\""
 msgstr "Správny podpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Správny podpis"
 
@@ -6251,7 +6264,7 @@ msgstr "Správny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6288,7 +6301,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
@@ -6508,217 +6521,217 @@ msgstr "Ostali nejaké značky. Spracovať?"
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, 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:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Č."
 
@@ -6727,44 +6740,50 @@ msgstr "Č."
 msgid "file %s already exists\n"
 msgstr "súbor %s už existuje\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Vytváram zobrazenie textu...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6773,7 +6792,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 5930a56c..fc956e1d 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,55 +435,55 @@ msgstr "Med pošiljanjem je prišlo do napake\n"
 msgid "Error occurred while sending command\n"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdravu ni bila najdena zahtevana časovna značka APOP\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Skladenjska napaka časovne značke v pozdravu\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Napaka v protokolu POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: brišem poteklo sporočilo %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Izpuščam sporočilo %d (%d zlogov)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "poštni predal je zaklenjen\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ne morem pričeti seje TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Ukaz"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
@@ -513,20 +513,20 @@ msgstr "Mapa"
 msgid "Junk mail filter"
 msgstr "Mapa"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1149,7 +1149,7 @@ msgstr "Pretvorba imenika naslovov"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Nič"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1693,156 +1693,169 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "SLAB podpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1852,48 +1865,48 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -1958,7 +1971,7 @@ msgstr "Premakni navzgor"
 msgid "Move Down"
 msgstr "Premakni navzdol"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Spremeni"
 
@@ -2077,7 +2090,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2525,7 +2538,7 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2585,68 +2598,68 @@ msgstr "Napaka pri branju polj LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Datoteka LDIF uspešno uvožena."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Izberite datoteko LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Polje LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Ime atributa"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Izberi"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adresar :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Ime datoteke :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Zapisi :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Uvozi datoteko LDIF v imenik naslovov"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Naslednji"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Podatki o datoteki"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Končaj"
 
@@ -2725,120 +2738,120 @@ msgstr "%s: Prenašam nova sporočila"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -3617,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -3927,25 +3940,25 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5917,17 +5930,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -6043,7 +6056,7 @@ msgstr "Preiskujem mapo %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6243,7 +6256,7 @@ msgstr "Noben podpis ni bil najden"
 msgid "Good signature from \"%s\""
 msgstr "Dober podpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Dober podpis"
 
@@ -6252,7 +6265,7 @@ msgstr "Dober podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6289,7 +6302,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "SLAB podpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "SLAB podpis"
 
@@ -6509,218 +6522,218 @@ msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, 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:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Ne."
 
@@ -6729,45 +6742,51 @@ msgstr "Ne."
 msgid "file %s already exists\n"
 msgstr "Datoteka %s že obstaja\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Ustvarjam ogled besedila...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6776,7 +6795,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index d45ecc37..3fa72703 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -436,55 +436,55 @@ msgstr "Došlo je do greške prilikom slanja\n"
 msgid "Error occurred while sending command\n"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Potrebni APOP timestamp nije pronađen u pozdravu\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntax greška u timestampu kod pozdrava\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "greška POP3 protokola \n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Brianje pouka koje su istekle %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakanje poruke %d (%d byte-ova)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "sanduče je zaključano\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr ""
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "ne mogu pokrenuti TLS sesiju\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom provere identiteta\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom provere identiteta\n"
@@ -514,20 +514,20 @@ msgstr "Direktorijum"
 msgid "Junk mail filter"
 msgstr "Direktorijum"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obeleženu datoteku\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1143,7 +1143,7 @@ msgstr "Unos adresara"
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ništa"
 
@@ -1611,7 +1611,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1688,156 +1688,169 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1847,48 +1860,48 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -1953,7 +1966,7 @@ msgstr "Pomeri gore"
 msgid "Move Down"
 msgstr "Pomeri dole"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Izmeni"
 
@@ -2072,7 +2085,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2520,7 +2533,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2580,68 +2593,68 @@ msgstr "Greška pri čitanju LDIF polja."
 msgid "LDIF file imported successfully."
 msgstr "LDIF datoteka je uspežno uvežena."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Odaberite LDIF datoteku"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF polje"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Ime Atributa"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Odaberi"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adresar :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Ime datoteke :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Beleške :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Unesi LDIF datoteku u Adresar"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Sled."
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Info datoteke"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Atributi"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Gotovo"
 
@@ -2720,120 +2733,120 @@ msgstr "%s: Primam nove poruke"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -3613,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3923,25 +3936,25 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5912,17 +5925,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -6038,7 +6051,7 @@ msgstr "Pretražujem direktorijum %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6242,7 +6255,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -6251,7 +6264,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6288,7 +6301,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -6508,217 +6521,217 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Ne."
 
@@ -6727,45 +6740,51 @@ msgstr "Ne."
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Stvaranje pregleda teksta...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6774,7 +6793,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index ce4065c4..0a6024a6 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -435,54 +435,54 @@ msgstr "Fel uppstod vid postning\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fel uppstod när kommandot skickades\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nödvändig APOP-tidsmarkering inte funnen i hälsning\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaxfel på tidsmarkering i hälsning\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3-protokollfel\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "felaktigt UIDL-svar: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Tar bort utgånget meddelande %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Hoppar över meddelande %d (%d byte)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "brevlådan är låst\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "sessionens väntetid tog slut\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "kan inte starta TLS-session\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "kommando är inte stött\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
@@ -510,20 +510,20 @@ msgstr "Skräppostfilter"
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "kan inte öppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1140,7 +1140,7 @@ msgstr "Adressbokskonvertering"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ingen"
 
@@ -1575,7 +1575,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1655,153 +1655,166 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "FELAKTIG signatur"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,44 +1824,44 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -1912,7 +1925,7 @@ msgstr "Flytta upp"
 msgid "Move Down"
 msgstr "Flytta ner"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Ändra"
 
@@ -2031,7 +2044,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2475,7 +2488,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2535,68 +2548,68 @@ msgstr "Fel vid inläsning av LDIF-fält."
 msgid "LDIF file imported successfully."
 msgstr "LDIF-fil importerad."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Välj LDIF-fil"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF-fält"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Attributnamn"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Välj"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adressbok:"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Filnamn:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Register:"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Importera LDIF-fil till adressboken"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Nästa"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Filinfo"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Attribut"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Avsluta"
 
@@ -2674,64 +2687,64 @@ msgstr "%s: Hämtar nya meddelanden"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2740,28 +2753,28 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2770,11 +2783,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2783,15 +2796,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -3549,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3852,24 +3865,24 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5785,17 +5798,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Datum"
 
@@ -5912,7 +5925,7 @@ msgstr "Söker igenom mapp %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6114,7 +6127,7 @@ msgstr "Ingen signatur funnen"
 msgid "Good signature from \"%s\""
 msgstr "Bra signatur från \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Bra signatur"
 
@@ -6123,7 +6136,7 @@ msgstr "Bra signatur"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Giltig signatur med nyckeln för \"%s\" är inte pålitlig"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Giltig signatur (opålitlig nyckel)"
 
@@ -6159,7 +6172,7 @@ msgstr "Signaturen giltig men signerande nyckeln har återkallats"
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "FELAKTIG signatur"
 
@@ -6378,214 +6391,214 @@ msgstr "Några markeringar finns kvar. Behandla dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Nr."
 
@@ -6594,39 +6607,45 @@ msgstr "Nr."
 msgid "file %s already exists\n"
 msgstr "filen %s finns redan\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Skapar textvy...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6639,7 +6658,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index f6a12fe9..0c45923a 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -436,54 +436,54 @@ msgstr "Postalama sırasında hata\n"
 msgid "Error occurred while sending command\n"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman etiketi görüşmede bulunamadı\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zaman etiketi yazım hatası\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol hatası\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "hatalı UIDL cevabı: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Eski postalar siliniyor %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Posta atlanıyor %d (%d byte)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "TLS oturumu başlatılamıyor\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "yetkilendirme sırasında hata oluştu\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata oluştu\n"
 
@@ -512,20 +512,20 @@ msgstr "dizin:"
 msgid "Junk mail filter"
 msgstr "dizin:"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "işaret dosyası açılamadı\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1145,7 +1145,7 @@ msgstr "Adres Defteri Çevrimi"
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1604,7 +1604,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1681,155 +1681,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "KÖTÜ imza"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1839,48 +1852,48 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -1945,7 +1958,7 @@ msgstr "Yukarı"
 msgid "Move Down"
 msgstr "Aşağı"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Düzenle"
 
@@ -2065,7 +2078,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2510,7 +2523,7 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2570,68 +2583,68 @@ msgstr "LDIF alanları okunurken hata."
 msgid "LDIF file imported successfully."
 msgstr "Eski adres defteri başarıyla dışarıdan aktarıldı."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "LDIF Dosyasını Seçin"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Dosya Adı"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF Alanı"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Özellik Adı"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Özellik"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Seç"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Adres Defteri :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Dosya Adı :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Kayıtlar :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "LDIF dosyasını Adres Defterine aktar"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Dosya Bilgisi"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Özellikler"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Bitir"
 
@@ -2709,64 +2722,64 @@ msgstr "%s: Yeni iletiler alınıyor"
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2775,28 +2788,28 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2805,11 +2818,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2818,15 +2831,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -3589,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3895,25 +3908,25 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5861,17 +5874,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Tarih"
 
@@ -5987,7 +6000,7 @@ msgstr "%s dizini taranıyor..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6188,7 +6201,7 @@ msgstr "İmza bulunamadı"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"'ten iyi imza"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "İyi imza"
 
@@ -6197,7 +6210,7 @@ msgstr "İyi imza"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6234,7 +6247,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" ten hatalı imza"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "KÖTÜ imza"
 
@@ -6459,215 +6472,215 @@ msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Hayır."
 
@@ -6676,44 +6689,50 @@ msgstr "Hayır."
 msgid "file %s already exists\n"
 msgstr "%s dosyası zaten var\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Metin görünüm oluşturuluyor...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Bu mesaj görüntülenemiyor.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Tarayıcı"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6725,7 +6744,7 @@ msgstr ""
 "görünenden (%s) farklı.\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index a4b7c787..8b51e294 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -442,54 +442,54 @@ msgstr "Трапилась помилка при відсиланні\n"
 msgid "Error occurred while sending command\n"
 msgstr "При відсиланні команди трапилась помилка\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "У привітанні не знайдено обов'язкового APOP timestamp\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Синтаксична помилка в timestamp у привітанні\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Помилка протоколу POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "невірна відповідь UIDL: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Вилучаємо застарілий лист %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропускаємо лист %d (%d байтів)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "скриньку заблоковано\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "таймаут сесії\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "не вдалось почати сесію TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "помилка при аутентифікації\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "команда не підтримується\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "помилка під час сесії POP3\n"
 
@@ -517,20 +517,20 @@ msgstr "фільтр мотлоху"
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "не вдалось відкрити файл позначок\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не вдалось стягти лист %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1142,7 +1142,7 @@ msgstr "Конвертування адресної книги"
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "Адресна книга"
 
@@ -1184,7 +1184,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Ніякий"
 
@@ -1572,7 +1572,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1651,152 +1651,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Чернетка"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Приєднати файл"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Приєднати підпис"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1805,44 +1818,44 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -1906,7 +1919,7 @@ msgstr "Вгору"
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Змінити"
 
@@ -2025,7 +2038,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2467,7 +2480,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -2527,68 +2540,68 @@ msgstr "Помилка при читанні полів LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Успішно імпортовано файл LDIF."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Оберіть файл LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Назва файла"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Поле LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Ім'я атрибута"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Обрати"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Адресна книга :"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Назва файла :"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Записи :"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Імпортувати файл LDIF в адресну книгу"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Далі"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Інформація про файл"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Атрибути"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Закінчити"
 
@@ -2666,64 +2679,64 @@ msgstr "%s: Отримання нових листів"
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2732,28 +2745,28 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2762,11 +2775,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2775,15 +2788,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -3533,8 +3546,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3858,24 +3871,24 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr "Лист буде надруковано наступною командою:"
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Команда друку за замовчуванням)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5768,17 +5781,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Дата"
 
@@ -5893,7 +5906,7 @@ msgstr "Шукаємо %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Шукаємо %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6093,7 +6106,7 @@ msgstr "Підпису не знайдено"
 msgid "Good signature from \"%s\""
 msgstr "Гарний підпис від \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Гарний підпис"
 
@@ -6102,7 +6115,7 @@ msgstr "Гарний підпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Належний підпис, але ключ для  \"%s\"  не перевірений"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Належний підпис (неперевірений ключ)"
 
@@ -6138,7 +6151,7 @@ msgstr "Належний підпис, але ключ відкликано"
 msgid "BAD signature from \"%s\""
 msgstr "ПОГАНИЙ підпис від \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "ПОГАНИЙ підпис"
 
@@ -6352,214 +6365,214 @@ msgstr "Залишились деякі позначки. Опрацювати?"
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Номер"
 
@@ -6568,39 +6581,45 @@ msgstr "Номер"
 msgid "file %s already exists\n"
 msgstr "файл %s вже існує\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Створюємо область перегляду тексту...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "Зберегти зображення як..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6613,7 +6632,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
diff --git a/po/vi.po b/po/vi.po
index aa692eeb..71e78b50 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -433,54 +433,54 @@ msgstr "Có lỗi khi gửi\n"
 msgid "Error occurred while sending command\n"
 msgstr "Có gỗi khi gửi lệnh\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Không thấy nhãn thời gian trong lời chào hỏi như yêu cầu\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Lỗi cú pháp nhãn thời gian trong lời chào hỏi\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "Lỗi giao thức POP3\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "hồi đáp UIDL không hợp lệ: %s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Đang xoá các thư hết hạn %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Đang bỏ qua thư %d (%d byte)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "hộp thư đã bị khoá\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "phiên làm việc hết giờ\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "không thể khởi động phiên TLS\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "có lỗi khi xác thực\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "lệnh không được hỗ trợ\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
@@ -508,20 +508,20 @@ msgstr "Lọc thư rác"
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "không thể mở tập tin đánh dấu\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -1123,7 +1123,7 @@ msgstr "Chuyển đổi sổ địa chỉ"
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 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:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "Không"
 
@@ -1553,7 +1553,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1632,152 +1632,165 @@ msgstr ""
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "Gửi"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "Gửi thư"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "Gửi sau"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 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:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "Bản nháp"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "Chèn"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "Chèn tập tin"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "Đính kèm"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 msgid "Append signature"
 msgstr "Chèn chữ kí "
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "Soạn với trình soạn thảo ngoài"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "Khuôn dòng"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 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:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, 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:5567
+#: src/compose.c:5590
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1786,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:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 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:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, 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:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -1887,7 +1900,7 @@ msgstr "Chuyển lên"
 msgid "Move Down"
 msgstr "Chuyển xuống"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "Thay đổi"
 
@@ -2006,7 +2019,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2448,7 +2461,7 @@ msgstr "Tiêu đề:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2508,68 +2521,68 @@ msgstr "Lỗi khi đọc các trường LDIF."
 msgid "LDIF file imported successfully."
 msgstr "Nhập khẩu thành công tập tin LDIF."
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "Chọn tập tin LDIF"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "Tên tập tin"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "Trường LDIF"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "Tên thuộc tính"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "Thuộc tính"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "Chọn"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "Sổ địa chỉ:"
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "Tên tập tin:"
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "Mảng:"
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "Nhập khẩu tập tin LDIF vào sổ địa chỉ"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "Trước"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "Tiếp"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "Thông tin tập tin"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "Thuộc tính"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "Hoàn thành"
 
@@ -2647,64 +2660,64 @@ msgstr "%s: Đang nhận thư mới"
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Đang lấy về (đã nhận %d thư (%s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2713,28 +2726,28 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2743,11 +2756,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2756,15 +2769,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -3514,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:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3839,24 +3852,24 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, 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:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 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:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 msgid "(Default print command)"
 msgstr "(Lệnh in mặc định)"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5746,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:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "Thời gian"
 
@@ -5871,7 +5884,7 @@ msgstr "Đang tìm %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang tìm %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6069,7 +6082,7 @@ msgstr "Không thấy chữ kí nào"
 msgid "Good signature from \"%s\""
 msgstr "Chữ kí chuẩn từ \"%s\""
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "Chữ kí chuẩn"
 
@@ -6078,7 +6091,7 @@ msgstr "Chữ kí chuẩn"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Chữ kí hợp lệ nhưng khoá ch \"%s\" không tin cậy"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "Chữ kí hợp lệ (chưa tin cậy)"
 
@@ -6114,7 +6127,7 @@ msgstr "Chữ kí hợp lệ nhưng khoá để kí đã bị thu hồi"
 msgid "BAD signature from \"%s\""
 msgstr "Chữ kí GIẢ từ \"%s\""
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "Chữ kí GIẢ"
 
@@ -6328,214 +6341,214 @@ msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "Tập trung thư theo tiêu đề..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 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:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, 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:2971
+#: src/summaryview.c:3002
 #, 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:3032
+#: src/summaryview.c:3063
 #, 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:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 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:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, 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:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, 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:3362
+#: src/summaryview.c:3393
 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:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "Số "
 
@@ -6544,39 +6557,45 @@ msgstr "Số "
 msgid "file %s already exists\n"
 msgstr "tập tin %s đã có trước\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Đang tạo khung xem văn bản...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "Không thể hiển thị được thư này.\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6589,7 +6608,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 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 f2906780..ed928595 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -431,54 +431,54 @@ msgstr "发表文章时发生错误\n"
 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在问候信息中没有发现需要的APOP时戳\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "在问候信息中时间戳语法错误\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 协议错误\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "无效的 UIDL 回应：%s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 正在删除过期邮件 %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3：跳过邮件 %d (%d 字节)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "信箱被锁住了\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "会话超时\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "无法启动 TLS 会话\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "验证时发生错误\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "不支持的命令\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 会话发生错误\n"
 
@@ -507,20 +507,20 @@ msgstr "文件夹："
 msgid "Junk mail filter"
 msgstr "文件夹："
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "无法打开标记文件\n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1131,7 +1131,7 @@ msgstr "地址簿转换"
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "地址簿"
 
@@ -1173,7 +1173,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "没有"
 
@@ -1569,7 +1569,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1645,155 +1645,168 @@ msgstr ""
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1803,47 +1816,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1908,7 +1921,7 @@ msgstr "上移"
 msgid "Move Down"
 msgstr "下移"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "修改"
 
@@ -2027,7 +2040,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
@@ -2472,7 +2485,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2532,68 +2545,68 @@ msgstr "读取 LDIF 字段时发生错误。"
 msgid "LDIF file imported successfully."
 msgstr "成功导入 LDIF 文件。"
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "选择 LDIF 文件"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "文件名"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF 字段"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "属性名"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "属性"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "选择"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "地址簿："
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "文件名："
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "记录："
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "导入 LDIF 文件到地址簿"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "下一个"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "文件信息"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "属性"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "完成"
 
@@ -2671,64 +2684,64 @@ msgstr "%s：正在获取新邮件"
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2737,28 +2750,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2767,11 +2780,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2780,15 +2793,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3543,8 +3556,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3848,25 +3861,25 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5794,17 +5807,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "日期"
 
@@ -5920,7 +5933,7 @@ msgstr "正在扫描文件夹 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6123,7 +6136,7 @@ msgstr "没有找到签名"
 msgid "Good signature from \"%s\""
 msgstr "来自“%s”的正确签名"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "正确的签名"
 
@@ -6132,7 +6145,7 @@ msgstr "正确的签名"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "签名有效，但是“%s”的密钥不被信任"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "签名有效 (非信任的密钥)"
 
@@ -6168,7 +6181,7 @@ msgstr "签名有效，但签名密钥已经被废止"
 msgid "BAD signature from \"%s\""
 msgstr "“%s”的签名错误"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "签名错误"
 
@@ -6388,215 +6401,215 @@ msgstr "有一些剩余标记。处理吗？"
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "No."
 
@@ -6605,43 +6618,49 @@ msgstr "No."
 msgid "file %s already exists\n"
 msgstr "文件 %s 已经存在。\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "正在创建文本视图...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件。\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6653,7 +6672,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b74c2f5a..b12feb00 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-06 17:22+0900\n"
+"POT-Creation-Date: 2006-09-19 11:22+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"
@@ -436,54 +436,54 @@ msgstr "發表文章時發生錯誤\n"
 msgid "Error occurred while sending command\n"
 msgstr "送出命令時發生錯誤。\n"
 
-#: libsylph/pop.c:154
+#: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在接觸通訊中找不到 APOP 的時間戳記。\n"
 
-#: libsylph/pop.c:161
+#: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
 msgstr "接觸通訊中的時間戳記語法錯誤\n"
 
-#: libsylph/pop.c:191 libsylph/pop.c:218
+#: libsylph/pop.c:192 libsylph/pop.c:219
 msgid "POP3 protocol error\n"
 msgstr "POP3 協定有錯誤\n"
 
-#: libsylph/pop.c:263
+#: libsylph/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "UIDL 回應錯誤：%s\n"
 
-#: libsylph/pop.c:623
+#: libsylph/pop.c:625
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 刪除過期的郵件 %d\n"
 
-#: libsylph/pop.c:632
+#: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d (%d 位元組)\n"
 
-#: libsylph/pop.c:663
+#: libsylph/pop.c:665
 msgid "mailbox is locked\n"
 msgstr "信箱已被鎖定，可能前一次擷取未完成。\n"
 
-#: libsylph/pop.c:666
+#: libsylph/pop.c:668
 msgid "session timeout\n"
 msgstr "作業逾時\n"
 
-#: libsylph/pop.c:672 libsylph/smtp.c:561
+#: libsylph/pop.c:674 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "無法啟動 TLS 工作階段\n"
 
-#: libsylph/pop.c:679 libsylph/smtp.c:496
+#: libsylph/pop.c:681 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "認證時發生錯誤\n"
 
-#: libsylph/pop.c:684
+#: libsylph/pop.c:686
 msgid "command not supported\n"
 msgstr "命令未支援\n"
 
-#: libsylph/pop.c:688
+#: libsylph/pop.c:690
 msgid "error occurred on POP3 session\n"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
@@ -511,20 +511,20 @@ msgstr "垃圾郵件資料夾"
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/procmime.c:1099
+#: libsylph/procmime.c:1123
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
-#: libsylph/procmsg.c:654
+#: libsylph/procmsg.c:655
 msgid "can't open mark file\n"
 msgstr "無法開啟標示的檔案 \n"
 
-#: libsylph/procmsg.c:1106
+#: libsylph/procmsg.c:1107
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1417
+#: libsylph/procmsg.c:1418
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\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:3168
-#: src/compose.c:3231 src/compose.c:3351
+#: libsylph/utils.c:2461 src/compose.c:2905 src/compose.c:3191
+#: src/compose.c:3254 src/compose.c:3374
 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:4345 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4368 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:4849 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4872 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:4850 src/prefs_common_dialog.c:2225
+#: src/addressbook.c:496 src/compose.c:4873 src/prefs_common_dialog.c:2225
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -1136,7 +1136,7 @@ msgstr "通訊錄格式轉換"
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3096 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:515
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -1178,7 +1178,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5570 src/main.c:622
+#: src/alertpanel.c:142 src/compose.c:5593 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:4829
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4859
 msgid "None"
 msgstr "無"
 
@@ -1571,7 +1571,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2541 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2178
+#: src/summaryview.c:2209
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1649,153 +1649,166 @@ msgstr ""
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3311
+#: src/compose.c:3150
+msgid "Encrypting with Bcc"
+msgstr ""
+
+#: src/compose.c:3151
+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 "
+"loss of confidentiality.\n"
+"\n"
+"Send it anyway?"
+msgstr ""
+
+#: src/compose.c:3334
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3329
+#: src/compose.c:3352
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3411
+#: src/compose.c:3434
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3418
+#: src/compose.c:3441
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4047
+#: src/compose.c:4070
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4160
+#: src/compose.c:4183
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4211 src/headerview.c:54
+#: src/compose.c:4234 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4285
+#: src/compose.c:4308
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4288
+#: src/compose.c:4311
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4326 src/compose.c:5404
+#: src/compose.c:4349 src/compose.c:5427
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4335 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4972
+#: 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
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4770 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
+#: src/compose.c:4793 src/mainwindow.c:2361 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:4771
+#: src/compose.c:4794
 msgid "Send message"
 msgstr "送出郵件"
 
-#: src/compose.c:4779
+#: src/compose.c:4802
 msgid "Send later"
 msgstr "稍後再送出"
 
-#: src/compose.c:4780
+#: src/compose.c:4803
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中稍後再送出"
 
-#: src/compose.c:4788
+#: src/compose.c:4811
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4789
+#: src/compose.c:4812
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4799
+#: src/compose.c:4822
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4800
+#: src/compose.c:4823
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4808
+#: src/compose.c:4831
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4809
+#: src/compose.c:4832
 msgid "Attach file"
 msgstr "附加檔案"
 
 #. signature
-#: src/compose.c:4819 src/prefs_account_dialog.c:1209
+#: src/compose.c:4842 src/prefs_account_dialog.c:1209
 #: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "簽章"
 
-#: src/compose.c:4820
+#: src/compose.c:4843
 #, fuzzy
 msgid "Append signature"
 msgstr "簽章檢查錯誤"
 
 #. editor
-#: src/compose.c:4829 src/prefs_common_dialog.c:1024
+#: src/compose.c:4852 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2357
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4830
+#: src/compose.c:4853
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4838
+#: src/compose.c:4861
 msgid "Linewrap"
 msgstr "折列"
 
-#: src/compose.c:4839
+#: src/compose.c:4862
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5300
+#: src/compose.c:5323
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5318
+#: src/compose.c:5341
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5386
+#: src/compose.c:5409
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5406 src/prefs_common_dialog.c:1477
+#: src/compose.c:5429 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5429 src/prefs_folder_item.c:202
+#: src/compose.c:5452 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5430
+#: src/compose.c:5453
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5519
+#: src/compose.c:5542
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5567
+#: src/compose.c:5590
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1805,44 +1818,44 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5943 src/compose.c:5948 src/compose.c:5954
+#: src/compose.c:5966 src/compose.c:5971 src/compose.c:5977
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6045
+#: src/compose.c:6068
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6068
+#: src/compose.c:6091
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6103
+#: src/compose.c:6126
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6104
+#: src/compose.c:6127
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6106
+#: src/compose.c:6129
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6148
+#: src/compose.c:6171
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6150
+#: src/compose.c:6173
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6151
+#: src/compose.c:6174
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -1906,7 +1919,7 @@ msgstr "向上移"
 msgid "Move Down"
 msgstr "向下移"
 
-#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:643
 msgid "Modify"
 msgstr "變更"
 
@@ -2025,7 +2038,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:534 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1723
 #: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr "..."
@@ -2469,7 +2482,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2181
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2212
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2529,68 +2542,68 @@ msgstr "匯入 LDIF 欄位錯誤"
 msgid "LDIF file imported successfully."
 msgstr "LDIF 檔案匯入完成。"
 
-#: src/importldif.c:449
+#: src/importldif.c:450
 msgid "Select LDIF File"
 msgstr "選擇 LDIF 檔案"
 
-#: src/importldif.c:525
+#: src/importldif.c:526
 msgid "File Name"
 msgstr "檔名"
 
-#: src/importldif.c:566
+#: src/importldif.c:567
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567 src/importldif.c:616
+#: src/importldif.c:568 src/importldif.c:617
 msgid "LDIF Field"
 msgstr "LDIF 欄位"
 
-#: src/importldif.c:568
+#: src/importldif.c:569
 msgid "Attribute Name"
 msgstr "屬性名"
 
-#: src/importldif.c:626
+#: src/importldif.c:627
 msgid "Attribute"
 msgstr "屬性"
 
-#: src/importldif.c:635 src/select-keys.c:342
+#: src/importldif.c:636 src/select-keys.c:342
 msgid "Select"
 msgstr "選擇"
 
-#: src/importldif.c:688
+#: src/importldif.c:689
 msgid "Address Book :"
 msgstr "通訊錄："
 
-#: src/importldif.c:698
+#: src/importldif.c:699
 msgid "File Name :"
 msgstr "檔名："
 
-#: src/importldif.c:708
+#: src/importldif.c:709
 msgid "Records :"
 msgstr "紀錄："
 
-#: src/importldif.c:736
+#: src/importldif.c:737
 msgid "Import LDIF file into Address Book"
 msgstr "將 LDIF 檔匯入通訊錄"
 
 #. Button panel
-#: src/importldif.c:767
+#: src/importldif.c:768
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:768 src/mainwindow.c:2457
+#: src/importldif.c:769 src/mainwindow.c:2457
 msgid "Next"
 msgstr "下一封"
 
-#: src/importldif.c:797
+#: src/importldif.c:798
 msgid "File Info"
 msgstr "檔案資訊"
 
-#: src/importldif.c:798
+#: src/importldif.c:799
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/importldif.c:799
+#: src/importldif.c:800
 msgid "Finish"
 msgstr "完成"
 
@@ -2668,64 +2681,64 @@ msgstr "%s: 取得新郵件中, 請稍候..."
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:718
+#: src/inc.c:720
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:797 src/send_message.c:633
+#: src/inc.c:799 src/send_message.c:633
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:798
+#: src/inc.c:800
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:803
+#: src/inc.c:805
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:807
+#: src/inc.c:809
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:811
+#: src/inc.c:813
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:815
+#: src/inc.c:817
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:825
+#: src/inc.c:827
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:832 src/send_message.c:651
+#: src/inc.c:834 src/send_message.c:651
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:857
+#: src/inc.c:859
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:878
+#: src/inc.c:880
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1113
+#: src/inc.c:1115
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1119
+#: src/inc.c:1121
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2734,39 +2747,39 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1130
+#: src/inc.c:1132
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1135
+#: src/inc.c:1137
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1140
+#: src/inc.c:1142
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1148 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1152
+#: src/inc.c:1154
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1156
+#: src/inc.c:1158
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1162 src/send_message.c:759
+#: src/inc.c:1164 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1167 src/send_message.c:762
+#: src/inc.c:1169 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2775,15 +2788,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1172 src/send_message.c:778
+#: src/inc.c:1174 src/send_message.c:778
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1208
+#: src/inc.c:1210
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1291
+#: src/inc.c:1293
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -3532,8 +3545,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1141 src/summaryview.c:2330 src/summaryview.c:2415
-#: src/summaryview.c:3969 src/summaryview.c:4098 src/summaryview.c:4460
+#: src/mainwindow.c:1141 src/summaryview.c:2361 src/summaryview.c:2446
+#: src/summaryview.c:4000 src/summaryview.c:4129 src/summaryview.c:4491
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3835,25 +3848,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:702 src/summaryview.c:3499
+#: src/messageview.c:702 src/summaryview.c:3530
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:760 src/summaryview.c:3522
+#: src/messageview.c:760 src/summaryview.c:3553
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:761 src/summaryview.c:3523
+#: src/messageview.c:761 src/summaryview.c:3554
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3525
+#: src/messageview.c:763 src/prefs_common_dialog.c:2346 src/summaryview.c:3556
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:771 src/summaryview.c:3533
+#: src/messageview.c:771 src/summaryview.c:3564
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5755,17 +5768,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4965
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4996
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4968
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4999
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4970
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:5001
 msgid "Date"
 msgstr "日期"
 
@@ -5881,7 +5894,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:675 src/summaryview.c:2105
+#: src/query_search.c:675 src/summaryview.c:2136
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6083,7 +6096,7 @@ msgstr "未發現簽章"
 msgid "Good signature from \"%s\""
 msgstr "來自\"%s\" 的簽章檢查正確"
 
-#: src/sigstatus.c:237 src/textview.c:765
+#: src/sigstatus.c:237 src/textview.c:766
 msgid "Good signature"
 msgstr "簽章檢查正確"
 
@@ -6092,7 +6105,7 @@ msgstr "簽章檢查正確"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰不可信。"
 
-#: src/sigstatus.c:242 src/textview.c:767
+#: src/sigstatus.c:242 src/textview.c:768
 msgid "Valid signature (untrusted key)"
 msgstr "簽章有效 (不可信的金鑰)"
 
@@ -6128,7 +6141,7 @@ msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已撤消"
 msgid "BAD signature from \"%s\""
 msgstr "來自 \"%s\" 的簽章檢查錯誤"
 
-#: src/sigstatus.c:260 src/textview.c:769
+#: src/sigstatus.c:260 src/textview.c:770
 msgid "BAD signature"
 msgstr "簽章檢查錯誤"
 
@@ -6347,214 +6360,214 @@ msgstr "某些郵件已被標記。要繼續嗎？"
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1364
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1370 src/summaryview.c:1379
+#: src/summaryview.c:1385 src/summaryview.c:1394
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1386
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1373
+#: src/summaryview.c:1388
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1380
+#: src/summaryview.c:1395
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1388 src/summaryview.c:1397
+#: src/summaryview.c:1403 src/summaryview.c:1412
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1389
+#: src/summaryview.c:1404
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1391
+#: src/summaryview.c:1406
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1413
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1406 src/summaryview.c:1415
+#: src/summaryview.c:1421 src/summaryview.c:1430
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1407
+#: src/summaryview.c:1422
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1409 src/summaryview.c:1418
+#: src/summaryview.c:1424 src/summaryview.c:1433
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1416
+#: src/summaryview.c:1431
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1424 src/summaryview.c:1433
+#: src/summaryview.c:1439 src/summaryview.c:1448
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1425
+#: src/summaryview.c:1440
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1427 src/summaryview.c:1436
+#: src/summaryview.c:1442 src/summaryview.c:1451
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1434
+#: src/summaryview.c:1449
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1750
+#: src/summaryview.c:1765
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1959
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1948
+#: src/summaryview.c:1963
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1949 src/summaryview.c:1954
+#: src/summaryview.c:1964 src/summaryview.c:1969
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:1953
+#: src/summaryview.c:1968
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1968
+#: src/summaryview.c:1983
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:1990
+#: src/summaryview.c:2005
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1994
+#: src/summaryview.c:2009
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:2028
+#: src/summaryview.c:2045
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2265
+#: src/summaryview.c:2296
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2267
+#: src/summaryview.c:2298
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2374
+#: src/summaryview.c:2405
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2750
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2779
+#: src/summaryview.c:2810
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2971
+#: src/summaryview.c:3002
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3032
+#: src/summaryview.c:3063
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3060
+#: src/summaryview.c:3091
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3061
+#: src/summaryview.c:3092
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3135
+#: src/summaryview.c:3166
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3204
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3233
+#: src/summaryview.c:3264
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3296
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3331
+#: src/summaryview.c:3362
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3362
+#: src/summaryview.c:3393
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3570
+#: src/summaryview.c:3601
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3876 src/summaryview.c:3877
+#: src/summaryview.c:3907 src/summaryview.c:3908
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4027 src/summaryview.c:4028
+#: src/summaryview.c:4058 src/summaryview.c:4059
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4321 src/summaryview.c:4379
+#: src/summaryview.c:4352 src/summaryview.c:4410
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4430
+#: src/summaryview.c:4461
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4431
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4467
+#: src/summaryview.c:4498
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4974
+#: src/summaryview.c:5005
 msgid "No."
 msgstr "No."
 
@@ -6563,39 +6576,45 @@ msgstr "No."
 msgid "file %s already exists\n"
 msgstr "檔案 %s 已存在。\n"
 
-#: src/textview.c:251
+#: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "產生文字視窗...\n"
 
-#: src/textview.c:817
+#: src/textview.c:822
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:1967
+#: src/textview.c:846
+msgid ""
+"The body text couldn't be displayed because writing to temporary file "
+"failed.\n"
+msgstr ""
+
+#: src/textview.c:1977
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:1983 src/trayicon.c:114
+#: src/textview.c:1993 src/trayicon.c:114
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:1985
+#: src/textview.c:1995
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:1987
+#: src/textview.c:1997
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:1990
+#: src/textview.c:2000
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:1992
+#: src/textview.c:2002
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2135
+#: src/textview.c:2145
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6607,7 +6626,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2140
+#: src/textview.c:2150
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"