ported to gpgme-1.0.

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

27 files changed, 23114 insertions, 23333 deletions

diff --git a/po/bg.po b/po/bg.po
index 9b0c276f..99d28b49 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: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -64,22 +64,6 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "ОК"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Четене на конфигурация за всеки акаунт...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Име"
 
@@ -129,30 +113,30 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сървър"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Редактиране"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Изтриване"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Надолу"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Нагоре"
@@ -161,13 +145,6 @@ msgstr "Нагоре"
 msgid " Set as default account "
 msgstr " Избиране като акаунт по подразбиране"
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Затваряне"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Изтриване на акаунт"
@@ -176,24 +153,15 @@ msgstr "Изтриване на акаунт"
 msgid "Do you really want to delete this account?"
 msgstr "Желаете ли да изтриете този акаунт?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Не"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Изпълнява: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Приключи: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Вход/Изход на действие"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Изпращане"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Прекратяване"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,11 +240,11 @@ msgstr ""
 "(`%%h' ще бъде заменен с аргумента)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Скрит потребителски аргумент на действието"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "(`%%u' ще бъде заменен с аргумента)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Потребителски аргумент на действието"
 
@@ -295,13 +263,13 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Забележки"
 
@@ -309,24 +277,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Отказ"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Файл"
@@ -347,8 +298,8 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -366,7 +317,7 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
@@ -398,7 +349,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -407,12 +358,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -429,7 +380,7 @@ msgstr "/Нова _Група"
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Редактиране"
@@ -452,18 +403,18 @@ msgstr "/_Изтриване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Име:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -492,18 +443,6 @@ msgstr "Изтриване на адрес(ите)"
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Не"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -621,7 +560,7 @@ msgstr "Грешка при конвертиране на адресната к�
 msgid "Addressbook Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -665,359 +604,359 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Грешка"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Създаване на алармен диалог...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Показване на това съобщение следвашия път"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Оранжев"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Червен"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Розов"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Небесно син"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Син"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Зелен"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Кафяв"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Редактиране/_Напреднал"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Редактиране/_Напреднал/Преместване на знак назад"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Редактиране/_Напреднал/Преместване на знак напред"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Редактиране/_Напреднал/Преместване на дума назад"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Редактиране/_Напреднал/Преместване на дума напред"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Редактиране/_Напреднал/Преместване до началото на ред"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Редактиране/_Напреднал/Преместване до края на ред"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Редактиране/_Напреднал/Преместване до предишен ред"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Редактиране/_Напреднал/Преместване до следващ ред"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на знак назад"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на знак напред"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на дума назад"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Редактиране/_Напреднал/Изтриване на дума напред"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Редактиране/_Напреднал/Изтриване на ред"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Редактиране/_Напреднал/Изтриване до края на ред"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Редактирано]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Съставяне на съобщение%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1025,26 +964,26 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1055,138 +994,138 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "Не може да се запишат хедърите\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME тип"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Вмъкване на сигнатура"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,66 +1136,66 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Прекратен process group id: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временен файл: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Съставяне: вход от наблюдаващ процес\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Не може да се стартира външен редактор\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Не може да се запише във файл\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Четене на pipe провалено\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Изоставяне на съобщение"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Изоставяне"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "при Чернови"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Заменяне"
 
@@ -1264,77 +1203,76 @@ msgstr "Заменяне"
 msgid "Edit address"
 msgstr "Редактиране на адрес"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Добавяне на Ново Лице"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Редактиране детайли за лице"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Трябва да бъде попълнен E-Mail адрес."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Име и Стойност трябва да бъдат попълнени."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Редактиране на данни за лице"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Екранно Име"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Име"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Прякор"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-Mail адрес"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Местене нагоре"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Местене надолу"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Променяне"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Стойност"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Основни данни"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Атрибути на потребител"
 
@@ -1350,7 +1288,7 @@ msgstr "Файлът не изглежда да е валиден формат �
 msgid "Could not read file."
 msgstr "Не може да се прочете файл."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Редактиране на Адресна Книга"
 
@@ -1363,7 +1301,7 @@ msgstr " Проверка на файл "
 msgid "File"
 msgstr "Файл"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Добавяне на нова Адресна Книга"
 
@@ -1395,32 +1333,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Налични адреси"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Местене на E-Mail адреси до или от Група с бутоните със стрелки"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Редактиране на детайли за Група"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Добавяне на Нова Група"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Редактиране на папка"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -1432,11 +1370,11 @@ msgstr "Файлът не изглежда да е JPilot формат."
 msgid "Select JPilot File"
 msgstr "Избор на JPilot файл"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1445,7 +1383,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Допълнителен E-Mail адрес(и)"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Добавяне на нов JPilot запис"
 
@@ -1453,63 +1391,63 @@ msgstr "Добавяне на нов JPilot запис"
 msgid "Connected successfully to server"
 msgstr "Успешно свързване със сървър"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Не може да се установи връзка със сървър"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Редактиране на LDAP сървър"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Име на хост"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Порт"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Проверка на Сървър "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Търсене в база"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Критерий за търсене"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Начално установяване "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Пауза (сек)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Основни"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Разширен"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Добавяне на нов LDAP сървър"
 
@@ -1521,7 +1459,7 @@ msgstr "Редакция LDAP - Избор на База за търсене"
 msgid "Available Search Base(s)"
 msgstr "Налични Бази за търсене"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Неуспешно прочитане на База за търсене от сървъра - моля задайте ръчно"
 
@@ -1533,11 +1471,11 @@ msgstr "Файлът не е валиден vCard формат"
 msgid "Select vCard File"
 msgstr "Избор на vCard файл"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Редакция на vCard запис"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Добавяне на нов vCard запис"
 
@@ -1566,10 +1504,10 @@ msgstr "Избор..."
 msgid "Select exporting file"
 msgstr "Избор на изходен файл"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
 
@@ -1577,41 +1515,41 @@ msgstr "неуспешно записване на настройките във
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -1674,64 +1612,64 @@ msgstr "Непрочетени"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Възобновяване на всички дървета на папки..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1741,16 +1679,16 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1759,24 +1697,24 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1785,34 +1723,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -1844,10 +1782,6 @@ msgstr "Съобщения"
 msgid "Type"
 msgstr "Тип"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Опресняване"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "ръководен"
@@ -1860,15 +1794,15 @@ msgstr "само за четене"
 msgid "unknown"
 msgstr "непознат"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Изпълнено."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d новинарски групи получени (%s прочетени)"
@@ -1885,11 +1819,11 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Няма От)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -2122,7 +2056,7 @@ msgstr "Име на атрибут"
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Избор"
 
@@ -2146,7 +2080,7 @@ msgstr "Внасяне на LDIF файл в Адресната книга"
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Следващ"
 
@@ -2162,134 +2096,134 @@ msgstr "Атрибути"
 msgid "Finish"
 msgstr "Завършване"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2298,27 +2232,27 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2327,11 +2261,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2340,16 +2274,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -2367,7 +2301,7 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2376,11 +2310,11 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не се поддържа от glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2388,16 +2322,16 @@ msgstr ""
 "GnuPG не е инсталиран правилно, или версията му е твърде стара.\n"
 "OpenPGP поддръжката е отменена."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2407,23 +2341,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2431,42 +2365,42 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3115,58 +3049,58 @@ msgstr "/_Помощ/_Чести въпроси/_Италиански"
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3176,16 +3110,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3194,144 +3128,144 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Получаване"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Приемане на нова поща"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Получаване от всички"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Приемане на нова поща от всички акаунти"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Отговаряне"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Отговаряне на съобщение"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "На всички"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Препращане"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Препращане на съобщението"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Изтриване на съобщението"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Следващо непрочетено съобщение"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Конфигуриране на акаунт"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
@@ -3431,10 +3365,6 @@ msgstr "Чувствителност към размера на символит
 msgid "Backward search"
 msgstr "Търсене назад"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Търсене"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Търсенето се провали"
@@ -3459,28 +3389,28 @@ msgstr "Търсенето приключи"
 msgid "Creating message view...\n"
 msgstr "Създаване на изглед на съобщениято...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Запазване като"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Презапис"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Желаете ли презаписване на съществуващ файл?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3489,7 +3419,7 @@ msgstr ""
 "Въведете командния ред за печат:\n"
 "(`%s' ще бъде заменен с име на файл)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3549,7 +3479,7 @@ msgstr "Създаване на MIME изглед...\n"
 msgid "MIME Type"
 msgstr "MIME Тип"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Текст"
 
@@ -3561,15 +3491,15 @@ msgstr "Притурки"
 msgid "Select \"Check signature\" to check"
 msgstr "Изберете \"Проверяване на подписа\" за проверка "
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Част от multipart съобщение не може да се запази."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Отваряне със"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3578,7 +3508,7 @@ msgstr ""
 "Въведете командният ред за отваряне на файл:\n"
 "(%s ще бъде заменен с име на файл)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командния ред за MIME преглед е невалиден: `%s'"
@@ -3684,15 +3614,15 @@ msgstr "Появи се грешка при публикуване\n"
 msgid "Error occurred while sending command\n"
 msgstr "Появи се грешка изпращане на съобщението."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Парола"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[няма потребителски id]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3705,7 +3635,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3713,70 +3643,66 @@ msgstr ""
 "Неправилна парола! Опитайте отново...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Не е намерен необходим APOP времеви отпечатък в поздрава\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Синтактична грешка във времевия отпечатък в поздрава\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 протоколна грешка\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "невалиден xover ред: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Изтриване на съобщениe с изтекъл срок %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Прескачане на съобщение %d (%d байта)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "пощенската кутия е заключена\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "сесията е просрочена\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "не може да се стартира TLS сесия\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "грешка при удостоверяване\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "командата не се поддържа\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "грешка при POP3 сесията\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Намерени %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Прилагане"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
@@ -3798,11 +3724,11 @@ msgstr "Предпочитания за акаунт"
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
@@ -3912,7 +3838,7 @@ msgstr "Изтегляне на всички съобщения от сървъ�
 msgid "Receive size limit"
 msgstr "Ограничение на размера при получаване"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "КB"
 
@@ -3932,7 +3858,7 @@ msgstr "(Нефилтрираните съобщения ще бъдат съх�
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -3940,7 +3866,7 @@ msgstr "Автоматично"
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Заглавна част"
 
@@ -3956,7 +3882,7 @@ msgstr "Генериране на Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Редактиране... "
 
@@ -4151,19 +4077,19 @@ msgstr ""
 "метод за криптирани съобщения. Той не спазва\n"
 "RFC 3156 - MIME Security with OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Конфигурация на действия"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Име на меню:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Команден ред:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4203,43 +4129,43 @@ msgstr ""
 "   %h за потребителски скрит аргумент\n"
 "   %s за избран текст   "
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Замяна "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Помощ за синтаксиса"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Регистрирани действия"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Нов)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Не е въведено име на менюто."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Двоеточие ':' не е позволено в името на меню."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Името на менюто е твърде дълго."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Не е въведен команден ред."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Името на менюто и командата за твърде дълги."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4250,91 +4176,91 @@ msgstr ""
 "%s\n"
 "има синтактична грешка."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Изтриване на действие"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Желаете ли изтриване на действието?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Създаване на прозорец за общи предпочитания...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Общи Предпочитания"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Цитат"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Дисплей"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Съобщение"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Други"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Външна програма"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Използване на външна програма за приемане"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Локален спул"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Приемане от спул"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Филтриране при приемане"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Автоматично проверяване за нова поща"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "всеки"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "минута(и)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Проверка за нова поща при стартиране"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Обновяване на всички локални папки след приемане"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4342,115 +4268,115 @@ msgstr ""
 "Максимален брой изтегляни статии\n"
 "(неограничено ако е въведена 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Запазване на изпратените съобщения в Изпратени"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Изходяща кодова таблица"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Автоматично (Препоръчително)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Западно европейски (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европейски (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийски (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4458,11 +4384,11 @@ msgstr ""
 "Ако е избрано `Автоматично', ще бъде избрано\n"
 "оптималното за текущия локал кодиране."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Преносно кодиране"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4470,115 +4396,115 @@ msgstr ""
 "Укажете Преносно Кодиране на Съдържанието(Content-Transfer-Encoding)\n"
 "използвано когато тялото на съобщението съдържа не-ASCII знаци."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Разделител на сигнатурата"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Автоматично вмъкване"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Автоматично стартиране на външен редактор"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Ниво на отмяна"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Пренасяне на съобщенията на"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "знака"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Пренасяне на цитат"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Пренасяне при въвеждане"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Пренасяне преди изпращане"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Автоматично избиране на акаунт за отговор"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Цитиране на съобщението при отговаряне"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Бутона за отговор изпълнява отговор до пощенски списък"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Формат на отговора"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Маркиране на цитат"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Формат на препращане"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Описание на символите "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Превеждане на име на заглавна част (като 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Съкращаване на новинарски групи по дълги от"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "букви"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Изглед на извадката"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Формат на датата"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "Определяне на атрибути на извадката"
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Позволяване на оцветяване на съобщение"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4586,64 +4512,64 @@ msgstr ""
 "Показване на multi-byte азбука и цифри като\n"
 "ASCII знаци (само за Японски)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Панел със заглавна част над изгледа на съобщението"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Разстояние м/у редовете"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "пиксел(а)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Превъртане"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Половин страница"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Плавно превъртане"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Стъпка"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Разпъване на прикрепени изображения"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Автоматична проверка на подписите"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Временно съхраняване на паролата в паметта"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Невалидно след"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "минута(и)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4651,35 +4577,35 @@ msgstr ""
 "(Установяване на `0' ще съхранява паролата\n"
 "през цялата сесия)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Прехващане на входа при въвеждане на парола"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Отваряне винаги на съобщенията избрани в извадката"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Влизане във входящата кутия след получаване на нови съобщения"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4687,216 +4613,216 @@ msgstr ""
 "(Съобщенията ще бъдат маркирани до изпълнението\n"
 "ако това е изключено)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Диалог при получаване"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Показване на диалог при получаване"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Винаги"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Никога"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Без повдигане на диалог за грешка при грешка при получаване"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Затваряне на диалога при получаване когато завърши"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Добавяне на адреса в назначението при двойно щракване"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "При излизане"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Потвърждение при излизане"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Изчистване на Кошчето на излизане"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Питане преди изчистване"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Предупреждение ако има съобщения в опашката"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Просрочка на В/И порт:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "секунда(и)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4920,11 +4846,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4938,7 +4864,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4950,15 +4876,15 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Избор на шрифт"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4968,31 +4894,31 @@ msgstr ""
 "Можете също да променяте препратките на всяко меню като натиснете\n"
 "кой да е клавиш(и) при поставяне на показалеца на мишката върху тях."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Собствена конфигурация на заглавни части"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Настоящи собствени заглавни части"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Не е въведено име на заглавната част."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Изтриване на заглавна част"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Желаете ли да изтриете тази заглавна част?"
 
@@ -5000,149 +4926,149 @@ msgstr "Желаете ли да изтриете тази заглавна ча
 msgid "Creating display header setting window...\n"
 msgstr "Създаване на прозорец с настройки на заглавните части...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Настройка на показваните заглавки части"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Име на заглавна част"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Показвани заглавни части"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Скрити заглавни части"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Показване на всички скрити заглавни части"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Четене на конфигурацията за показвани загл. части...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Записване на конфигурацията за показвани загл. части...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Тази заглавна част е вече в списъка."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Установяване на филтър"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Нагоре"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Надолу"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Копиране..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Изтриване на правило"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Желаете ли да изтриете правилото?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Изтриване на правило"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Скрити заглавни части"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Съобщение"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "съдържа"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "не съдържа"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5199,27 +5125,27 @@ msgstr "Изпълняване"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Папка"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Адрес"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Заглавна част"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Заглавна част"
@@ -5391,7 +5317,7 @@ msgstr "Изтриване на шаблона"
 msgid "Do you really want to delete this template?"
 msgstr "Желаете ли да изтриете шаблонът?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
@@ -5414,11 +5340,11 @@ msgstr "Изпращане на съобщение от опашката %d се
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Статус"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Създаване на диалог на прогреса...\n"
 
@@ -5430,97 +5356,66 @@ msgstr "възникна грешка при получаване на данн�
 msgid "Can't write to file.\n"
 msgstr "Не може да се запише във файл.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Подписът не е проверен"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Не е намерен подпис"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Валиден подпис"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "НЕВАЛИДЕН подпис"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Няма публичен ключ за проверка на подписът"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Грешка при проверяване на подписът"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Различни резултати за подписи"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Грешка: Неизвестен статус"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Валиден подпис от \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "НЕВАЛИДЕН подпис от \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Не може да се намери потребителски ID за ключът."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Подписът е направен на %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Отпечатък на ключа: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Грешка при проверяване на подписът"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Моля изберете ключ за `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Събиране на информация за '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Изберете ключове"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID на ключ"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr ""
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Добавяне на ключ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Въведете друг потребителски или ID на ключ:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Повредена заглавна част на съобщение в опашката.\n"
@@ -5607,15 +5502,78 @@ msgstr ""
 "Можете да използвате съществуваща пощенска кутия в MH формат.\n"
 "Ако не сте сигурни, изберете ОК."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Проверяване на подписа"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s от \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Не е намерен подпис"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Валиден подпис от \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Валиден подпис"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Подписът е направен на %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "НЕВАЛИДЕН подпис от \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "НЕВАЛИДЕН подпис"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Няма публичен ключ за проверка на подписът"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH не е наличен\n"
@@ -5819,256 +5777,256 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "Създаване на изглед на извадката...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Обработване на маркер"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Има останали маркери. Желаете ли да се обработят?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Избиране на всички съобщения..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr ""
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s вече съществува\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Създаване на текстов изглед...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "За да запазите тази част, извикайте контекстното меню с"
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "щракване с десния бутон и изберете `Запазване като...'."
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6076,11 +6034,11 @@ msgstr ""
 "или натиснете бутона `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "За да видите тази част като текстово съобщение, изберете"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6088,35 +6046,35 @@ msgstr ""
 "`Показване като текст', или натиснете бутон `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "За да отворите тази част с външна програма, изберете"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Отваряне' или `Отваряне със'...,"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "или щракнете два пъти, или щракнете с средния бутон,"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "или натиснете бутон `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Подписът все още не е проверен.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "За да го проверите, извикайте контекстното меню с\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "щракване с десния бутон и изберете `Проверяване на подписа'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6149,6 +6107,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
 
+#~ msgid "OK"
+#~ msgstr "ОК"
+
+#~ msgid "Close"
+#~ msgstr "Затваряне"
+
+#~ msgid "Cancel"
+#~ msgstr "Отказ"
+
+#~ msgid "No"
+#~ msgstr "Не"
+
+#~ msgid "Refresh"
+#~ msgstr "Опресняване"
+
+#~ msgid "Search"
+#~ msgstr "Търсене"
+
+#~ msgid "Apply"
+#~ msgstr "Прилагане"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Подписът не е проверен"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Различни резултати за подписи"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Грешка: Неизвестен статус"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Отпечатък на ключа: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Намерен етикет: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index dc485087..3f2dca03 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -63,22 +63,6 @@ msgstr ""
 "programem, pokud ne, napište na adresu Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Načítám nastavení pro všechny účty...\n"
@@ -112,11 +96,11 @@ msgstr ""
 "kontrolován při volbě 'Stáhnout vše, zaškrtněte políčko ve sloupci 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Jméno"
 
@@ -128,30 +112,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Přidat"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Upravit"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Smazat "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dolů"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Nahoru"
@@ -160,13 +144,6 @@ msgstr "Nahoru"
 msgid " Set as default account "
 msgstr " Nastavit účet jako výchozí "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zavřít"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Smazat účet"
@@ -175,24 +152,15 @@ msgstr "Smazat účet"
 msgid "Do you really want to delete this account?"
 msgstr "Opravdu chcete tento účet smazat?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ano"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Ne"
 
@@ -238,29 +206,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spuštěn: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončen: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Vstup/výstup pro akce"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Odeslat "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Přerušit"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -271,11 +239,11 @@ msgstr ""
 "('%%h' bude nahrazeno argumentem)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Skrytý argument uživatele pro akci"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -286,7 +254,7 @@ msgstr ""
 "('%%u' bude nahrazeno argumentem)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Argument uživatele pro akci"
 
@@ -294,13 +262,13 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do databáze"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -308,24 +276,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku pro databázi adres"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Soubor"
@@ -346,8 +297,8 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Soubor/Nový _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -365,7 +316,7 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
@@ -397,7 +348,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -406,12 +357,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -428,7 +379,7 @@ msgstr "/Nová _skupina"
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -438,7 +389,7 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Úp_ravy"
@@ -451,18 +402,18 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Databáze adres"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Jméno:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Smazat"
 
@@ -491,18 +442,6 @@ msgstr "Smazat adresu(y)"
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tuto adresu(y)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ne"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -618,7 +557,7 @@ msgstr "Chyba při konverzi databáze adres"
 msgid "Addressbook Conversion"
 msgstr "Konverze databáze adres"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Rozhraní"
 
@@ -662,359 +601,359 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Chyba"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Vytvářím dialog pro varování...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Zobrazovat příště tuto zprávu"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Červená"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Růžová"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Nebeská modř"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zelená"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Hnědá"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Žádná"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Uložit"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Zpráva/Poslat p_ozději"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Zpráva/Uložit jako _koncept"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Zpráva/Uložit a pok_račovat v editaci"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Připojit soubor"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit p_odpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_nova"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/_Rozšířené"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o znak zpět"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o znak dále"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o slovo zpět"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/_Rozšířené/Přesun o slov dále"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na začátek řádku"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na konec řádku"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na předchozí řádek"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/_Rozšířené/Přesun na další řádek"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat znak zpět"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat znak vpředu"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat slovo zpět"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/_Rozšířené/Smazat slovo vpředu"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/_Rozšířené/Smazat řádek"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/_Rozšířené/Smazat do konce řádku"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zarovnat aktuální odstavec"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zarovnat _všechny dlouhá řádky"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Komu"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/K_opie"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/_Slepá kopie"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/Z_obrazit/_Odpověď komu "
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/Z_obrazit/_Předat"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Databáze adres"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Nelze získat část textu\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovkách."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/přeposlání."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit délku souboru %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu načíst %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Psaní zprávy%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto mám zprávu odeslat?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "Nelze načíst seznam příjemců."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1022,26 +961,26 @@ msgstr ""
 "Není zadán účet pro odesílání mailů.\n"
 "Před odesláním vyberte prosím nějaký účet."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemohu najít žádný klíč asociovaný s aktuálně vybraným id klíče '%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "nelze změnit mód souboru\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1052,138 +991,138 @@ msgstr ""
 "%s na %s.\n"
 "Přesto poslat?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "nelze zapsat záhlaví\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "zařazuji zprávu...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "nelze najít složku s frontou zpráv\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Zprávu nelze zařadit\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytvářím číslo zprávy: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Vytvářím okno pro psaní...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Poslat později"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Zařadí do výstupní fronty a odešle později"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Uloží koncept do složky"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Připojí soubor"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Vloží podpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Úprava externím editorem"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1194,66 +1133,66 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Přerušen proces číslo: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný soubor: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Psaní: vstup z externího procesu\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Nelze spustit externí editor\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Nelze zapisovat do souboru\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Nelze číst\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Zrušit zprávu"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Stornovat"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "Uložit jako koncept"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Nahradit"
 
@@ -1261,77 +1200,76 @@ msgstr "Nahradit"
 msgid "Edit address"
 msgstr "Upravit adresu"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Přidat novou osobu"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Upravit detaily o osobě"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Nebyla zadána e-mail adresa."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Musí být zadáno jméno a hodnota."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Upravit data o osobě"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Zobrazit jméno"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Křestní jméno"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Přezdívka"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-mail adresa"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Posunout nahoru"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Změnit"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Základní data"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributy uživatele"
 
@@ -1347,7 +1285,7 @@ msgstr "Soubor není ve formátu pro databázi adres."
 msgid "Could not read file."
 msgstr "Nelze načíst soubor."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Upravit databázi adres"
 
@@ -1360,7 +1298,7 @@ msgstr " Otestovat soubor "
 msgid "File"
 msgstr "Soubor"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Přidat novou databázi adres"
 
@@ -1392,33 +1330,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mail adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -1430,11 +1368,11 @@ msgstr "Soubor není ve formátu pro JPilot."
 msgid "Select JPilot File"
 msgstr "Vybrat JPilot soubor"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Upravit JPilot soubor"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1443,7 +1381,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Další položka(y) e-mail adresy"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Přidat nový JPilot záznam"
 
@@ -1451,63 +1389,63 @@ msgstr "Přidat nový JPilot záznam"
 msgid "Connected successfully to server"
 msgstr "Úspěšně připojeno k serveru"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Nemohu se spojit se serverem"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Upravit LDAP server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Jméno počítače"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Zjistit server "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Báze pro hledání"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Vyhledávací kritéria"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Reset "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind Heslo"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (vteřin)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Základní"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Rozšíření"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Přidat nový LDAP server"
 
@@ -1519,7 +1457,7 @@ msgstr "Editace LDAP - Vyberte bázi pro hledání"
 msgid "Available Search Base(s)"
 msgstr "Dostupná(é) báze pro hledání"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Nelze načíst báze pro hledání ze serveru - zadejte je prosím ručně"
 
@@ -1531,11 +1469,11 @@ msgstr "Soubor není ve formátu vCard."
 msgid "Select vCard File"
 msgstr "Vybrat vCard soubor"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Upravit vCard záznam"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Přidat nový vCard záznam"
 
@@ -1564,10 +1502,10 @@ msgstr " Vybrat... "
 msgid "Select exporting file"
 msgstr "Vyberte soubor pro export"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "Selhání při zápisu konfigurace do souboru\n"
 
@@ -1575,41 +1513,41 @@ msgstr "Selhání při zápisu konfigurace do souboru\n"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "%c nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
@@ -1672,65 +1610,65 @@ msgstr "Nepřečtené"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o složce...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1740,16 +1678,16 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1758,24 +1696,24 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1784,34 +1722,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -1843,10 +1781,6 @@ msgstr "Zprávy"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Obnovit"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderovaný"
@@ -1859,15 +1793,15 @@ msgstr "pouze pro čtení"
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s čteno)"
@@ -1884,11 +1818,11 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -2125,7 +2059,7 @@ msgstr "Název atributu"
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Vybrat"
 
@@ -2149,7 +2083,7 @@ msgstr "Importovat LDIF soubor do databáze adres"
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Další"
 
@@ -2165,135 +2099,135 @@ msgstr "Atributy"
 msgid "Finish"
 msgstr "Konec"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Načítám nové zprávy"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Načítám"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Hotovo (Nejsou žádné nové zprávy)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (vteřin)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončeno (%d nová(é) zpráva(y))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Dokončeno (nejsou nové zprávy)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Získávám nové zprávy z účtu %s ...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Načítám nové zprávy"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojuji se na POP3 server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuji počet nových zpráv (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuji počet nových zpráv (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuji počet nových zpráv (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuji počet zpráv (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Ukončuji"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítám zprávu (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Spojení selhalo"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2302,27 +2236,27 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Nezbylo žádné místo na disku."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Nemohu zapisovat do souboru."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2331,11 +2265,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2344,16 +2278,16 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypršel čas relace\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Načítám nové zprávy z %s do %s...\n"
@@ -2371,7 +2305,7 @@ msgstr "Zadejte heslo"
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2380,11 +2314,11 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread není v glib podporován.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2392,16 +2326,16 @@ msgstr ""
 "GnuPG není korektně instalováno, nebo je verze příliš stará.\n"
 "Podpora pro OpenPGP je zakázána."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otevře okno pro psaní nové zprávy"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2411,64 +2345,64 @@ msgstr ""
 "                           otevře okno pro psaní zprávy s připojeným\n"
 "                           souborem(y)"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive             načte nové zprávy"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          načte všechny nové zprávy ze všech účtů"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send              pošle všechny pozdržené zprávy"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status             vypíše celkový počet zpráv"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug              režim trasování"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help            vypíše tento text a skončí"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version             vypíše informace o verzi a skončí"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Právě se vytváří zpráva. Opravdu skončit?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ve frontě jsou neodeslaně zprávy. Skončit nyní?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavení akcí"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3118,58 +3052,58 @@ msgstr "/Nápo_věda/_FAQ/_Italsky"
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Vytvářím hlavní okno...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Měním typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdnit koš"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3179,16 +3113,16 @@ msgstr ""
 "Pokud je zadán existující, bude automaticky\n"
 "prohledán."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka '%s' již existuje."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3198,144 +3132,144 @@ msgstr ""
 "Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
 "pro zápis."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazení složky"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Stáhnout"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Začlenit novou poštu"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Stáhnout vše"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Začlení novou poštu ze všech účtů"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odpovídá na zprávu"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odpov. všem"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odpovídá všem"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Poslat dál"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Předává zprávu dál"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Smazat zprávu"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Provést"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Provést označený proces "
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Další nepřečtenou zprávu"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Účet"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Nastavení účtu"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Ukončení programu"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Chcete ukončit tento program?"
 
@@ -3435,10 +3369,6 @@ msgstr "Rozlišovat malá a velká písmena"
 msgid "Backward search"
 msgstr "Hledat nazpět"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Vyhledat"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Neúspěšné hledání"
@@ -3463,28 +3393,28 @@ msgstr "Hledání ukončeno"
 msgid "Creating message view...\n"
 msgstr "Vyvolávám zobrazení zprávy...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Uložit jako"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Přepsat existující soubor?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3493,7 +3423,7 @@ msgstr ""
 "Vložte příkazovou řádku pro tisk:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3553,7 +3483,7 @@ msgstr "Vyvolávám zobrazení MIME...\n"
 msgid "MIME Type"
 msgstr "MIME Typ"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Text"
 
@@ -3565,15 +3495,15 @@ msgstr "Přílohy"
 msgid "Select \"Check signature\" to check"
 msgstr "Vyberte \"Zkontrolovat podpis\" pro ověření"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Nemohu uložit část z mnohačásťové zprávy."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Otevřít čím"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3582,7 +3512,7 @@ msgstr ""
 "Vložte příkazovou řádku pro otevření souboru:\n"
 "('%s' bude nahrazeno jménem souboru)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
@@ -3688,15 +3618,15 @@ 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 ."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[bez id uživatele]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3709,7 +3639,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3717,70 +3647,66 @@ msgstr ""
 "Špatná passphrase! Zkuste to znovu...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Chyba syntaxe pro časovou značku při pozdravu\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Chyba protokolu POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Neplatná xover řádka: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Vymazávám starou zprávu %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Přeskakuji zprávu %d (%d bytů)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "poštovní schránka je zamčena\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "vypršel čas relace\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "Nelze spustit TLS relaci\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Vyskytla se chyba v autentizaci\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "Příkaz není podporován\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "v POP3 relaci se vyskytla\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Nalezený %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfigurace je uložena.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Použít"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Otevření okna s nastavením účtu...\n"
@@ -3802,11 +3728,11 @@ msgstr "Nastavení účtu"
 msgid "Creating account preferences window...\n"
 msgstr "Vyvolání okna pro nastavení účtu...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Soukromí"
 
@@ -3916,7 +3842,7 @@ msgstr "Přijmout všechny zprávy ze serveru"
 msgid "Receive size limit"
 msgstr "Limit velikosti pro příjem"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3936,7 +3862,7 @@ msgstr "(Nefiltrované zprávy budou uloženy v této složce)"
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -3944,7 +3870,7 @@ msgstr "Automaticky"
 msgid "`Get all' checks for new messages on this account"
 msgstr "Při volbě 'Stáhnout vše' zjistit nové zprávy"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Záhlaví"
 
@@ -3960,7 +3886,7 @@ msgstr "Generovat číslo zprávy"
 msgid "Add user-defined header"
 msgstr "Přidat uživatelsky definované záhlaví"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Upravit..."
 
@@ -4155,19 +4081,19 @@ msgstr ""
 "ASCII-armored. Nevyhovuje totiž specifikaci\n"
 "RFC 3156 - MIME Security s OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Nastavení akcí"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Název nabídky:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Příkazová řádka:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4207,43 +4133,43 @@ msgstr ""
 "   %h pro skrytý argument zadaný uživatelem\n"
 "   %s pro vybraný text"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Nahradit "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Nápověda k syntaxi "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrované akce"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nový)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Není nastaven název nabídky."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "V názvu nabídky není povolena dvojtečka ':'."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Název nabídky je příliš dlouhý."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Název nabídky a příkaz jsou příliš dlouhé."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4254,91 +4180,91 @@ msgstr ""
 "%s\n"
 "má syntaktickou chybu."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Smazat akci"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Opravdu chcete smazat tuto akci?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Vytvářím okno hlavního nastavení...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Společná nastavení"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citování"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostatní"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Externí program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Použít externí program k začlenění"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Místní spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Začlenit ze spoolu"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtr na začlenění"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automatická kontrola nové pošty"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minut(y)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Kontrola nové pošty při spuštění"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Po začlenění aktualizovat všechny lokální složky"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Diskuzní skupiny"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4346,115 +4272,115 @@ msgstr ""
 "Maximální počet příspěvků pro stažení\n"
 "(0 pro neomezený počet)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Použít externí program pro posílání"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Uložit odeslané zprávy do složky Odeslaná pošta"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Výstupní znaková sada"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatická (doporučeno)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bitový ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Západní Evropa (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Západní Evropa(ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropská (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltická (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltická (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Řecká (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecká (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Azbuka (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonská (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonská (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonská (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínská (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínská (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínská (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínská (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korejská (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thajská (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thajská (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4462,11 +4388,11 @@ msgstr ""
 "Pokud je zvoleno 'Automatická', bude použita\n"
 "znaková sada podle locale."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Kódování přenosu"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4474,115 +4400,115 @@ msgstr ""
 "Určuje jak v jaké znakové sadě bude zpráva\n"
 "poslána když obsahuje ne-ASCII znaky."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Oddělovač podpisu"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Automaticky vložit"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit externí editor"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Úroveň zpětných kroků"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Zarovnat zprávu na"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znaků"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Zalomit citaci"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Zalomit při přijmutí"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Zalomit před odesláním"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automaticky vybrat účet pro odpovědi"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citovat zprávy při odpovídání"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko s odpovědí zvolí odpověď do diskusního listu"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formát odpovědi"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Značka pro citaci"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formát přeposlání"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Popis symbolů "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Písmo"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Překládat názvy záhlaví (jako například 'Od:', 'Předmět:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Zobrazit počet nepřečtených za názvem složky"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkrátit názvy diskuzních skupin delší než"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "dopisy(ů)"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Souhrnný pohled"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobrazit příjemce ve sloupci 'Od', jestliže odesílatel jste vy sám"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Rozbalit vlákna"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formát datumu"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Nastavení zobrazených položek v souhrnu... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Povolit zabarvení zpráv"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4590,64 +4516,64 @@ msgstr ""
 "Zobrazit více-bytovou abecedu a číslice\n"
 "jako ASCII znaky (pouze pro Japonsko)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Zobrazit okno se záhlavím nad zprávou"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Zobrazit krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(y)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Změnit velikost připojených obrázků"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automaticky zkontrolovat podpis"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazit výsledek testování podpisu v popup okně"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložit passphrase dočasně v paměti"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Vyprší za"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minut(y) "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4655,35 +4581,35 @@ msgstr ""
 "(Nastavení na '0' uloží passphrase\n"
 " pro celou relaci)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazit varování pokud GnuPG nefunguje"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Vybrané zprávy vždy otvírat v přehledu"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Při vstupu do složky otevřít první nepřečtenou zprávu"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Označit zprávu za přečtěnou pouze při otevření v novém okně"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Po přijetí nových zpráv přejít na Doručenou poštu"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4691,216 +4617,216 @@ msgstr ""
 "(Pokud je tato volba vypnuta,\n"
 "zprávy budou označeny až do vykonání)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Dialog o přijetí"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Zobrazit dialog o přijetí"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Při příjmu chyby nezobrazovat popup dialog"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Zavřít dialog o přijetí po dokončení"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externí příkaz (%s bude nahrazen jménem souboru / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Přidat adresu do cíle dvojklikem"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potvrdit ukončení"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Při ukončení vyprázdnit koš"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Potvrdit vyprázdnění"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zprávy ve frontě"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Čas vypršení pro I/O:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "sekund(a)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "zkratky pro názvy dnů v týdnu"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "zkratka pro měsíc"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "preferované datum a čas podle aktuálního locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci číselně"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny číselně s 24 hodinových cyklem"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny číselně s 12 hodinových cyklem"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "rok číselně"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "měsíc číselně"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minuty číselně"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "vteřiny číselně"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu číselně"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "preferovaný datum pro aktuální locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Nastavení barev pro zprávy"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - První úroveň"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Třetí úroveň"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Zvolte barvu pro 1 úroveň citace"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Zvolte barvu pro 2 úroveň citace"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Zvolte barvu pro 3 úroveň citace"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Získat barvu z URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4924,11 +4850,11 @@ msgstr ""
 "Diskuzní skupina\n"
 "Číslo zprávy"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4942,7 +4868,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4954,15 +4880,15 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Výběr písma"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4972,31 +4898,31 @@ msgstr ""
 "Klávesovou zkratku pro nabídku můžete také změnit tak,\n"
 "že při najetí myší na položku stisknete odpovídající klávesu."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Vlastní nastavení záhlaví"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Vlastní záhlaví"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Není nastaven název záhlaví."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Smazat záhlaví"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Opravdu chcete smazat toto záhlaví?"
 
@@ -5004,150 +4930,150 @@ msgstr "Opravdu chcete smazat toto záhlaví?"
 msgid "Creating display header setting window...\n"
 msgstr "Vytvářím okno pro zobrazení nastavení záhlaví...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Zobrazit nastavení záhlaví"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Název záhlaví"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Zobrazené záhlaví"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skryté záhlaví"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Zobrazit všechny nespecifikovaná záhlaví"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Načítám konfiguraci zobrazovaného záhlaví...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Zapisuji konfiguraci zobrazovaného záhlaví...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Toto záhlaví je již v seznamu."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Nastavení filtru"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Komu:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopírovat..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Opravdu chcete smazat toto pravidlo?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Všechna záhlaví"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Zpráva"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5204,27 +5130,27 @@ msgstr "Provést"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Složka"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Záhlaví"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Záhlaví"
@@ -5396,7 +5322,7 @@ msgstr "Smazat šablonu"
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete smazat tuto šablonu?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
@@ -5419,11 +5345,11 @@ msgstr "Neúspěšné poslání zprávy %d z fronty.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkazový řádek tisku: '%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Stav"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Vytvářím dialog procesu...\n"
 
@@ -5435,97 +5361,66 @@ msgstr "Během obnovy dat se vyskytla chyba.\n"
 msgid "Can't write to file.\n"
 msgstr "Nemohu zapisovat do souboru.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Podpis není verifikován"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Podpis nenalezen"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Správný podpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "ŠPATNÝ podpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nelze najít veřejný klíč pro podpis"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Chyba při verifikaci podpisu"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Různé výsledky pro podpisy"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Chyba: Neznámý status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Správný podpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "ŠPATNÝ podpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Nemohu najít ID uživatele pro tento klíč."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                alias \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis vyrobil %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Key fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Chyba při verifikaci podpisu"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Vyberte prosím klíč pro '%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Získávám info pro '%s'... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Vybrat klíče"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID klíče"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Přidat klíč"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Zadejte dalšího uživatele nebo klíčové ID:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Fronta hlaviček zpráv je poškozená.\n"
@@ -5614,15 +5509,78 @@ msgstr ""
 "poštovní schránku v MH formátu.\n"
 "Pokud si nejste jisti, stiskněte pouze OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Zkontrolovat podpis"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Podpis nenalezen"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Správný podpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Správný podpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Podpis vyrobil %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "ŠPATNÝ podpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "ŠPATNÝ podpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nelze najít veřejný klíč pro podpis"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH je nedostupná\n"
@@ -5826,258 +5784,258 @@ msgstr "Čís."
 msgid "Creating summary view...\n"
 msgstr "Vytvářím celkový pohled...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Nejsou již žádné nepřečtené zprávy"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Nejsou již žádné nové zprávy"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 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:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Nejsou již žádné označené zprávy"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Žádná neoznačená zpráva."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Nejsou již žádné zprávy s návěštím"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 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:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Žádná zpráva s návěštím."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 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:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Získávám zprávy od osoby..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazané"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěné"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " položky(ek) vybrány"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nových, %d nepřečtených, %d celkem"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, 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:2343
+#: src/summaryview.c:2328
 #, 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:2390
+#: src/summaryview.c:2375
 #, 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:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, 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:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Vybírám všechny zprávy..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "soubor '%s' už existuje\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Vytvářím zobrazení textu...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "zpráva nebyla přijata\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Pro uložení této části vyvolejte kontextovou nabídku pomocí "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "pravého tlačítka myši a zvolte 'Uložit jako...' "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6085,11 +6043,11 @@ msgstr ""
 "nebo stiskněte klávesu 'y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "K zobrazení této části jako textové zprávy vyberte "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6097,35 +6055,35 @@ msgstr ""
 "'Zobrazit jako text', nebo stiskněte klávesu 't'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "K otevření této části pomocí externího programu vyberte "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "'Otevřít' nebo 'Otevřít čím...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "nebo poklepejte dvakrát či klepněte na střední tlačítko, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "nebo stiskněte klávesu 'I'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Tento podpis nebyl zatím kontrolován.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Pro zkontrolování vyvolejte kontextovou nabídku pomocí\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "pravého tlačítka myši a zvolte 'Zkontrolovat podpis'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6158,6 +6116,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Neúspěšný zápis do %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Refresh"
+#~ msgstr "Obnovit"
+
+#~ msgid "Search"
+#~ msgstr "Vyhledat"
+
+#~ msgid "Apply"
+#~ msgstr "Použít"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Podpis není verifikován"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Různé výsledky pro podpisy"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Chyba: Neznámý status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                alias \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Key fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Nalezeno návěští: %s\n"
 
diff --git a/po/da.po b/po/da.po
index 3e272161..6ac8ac50 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -62,22 +62,6 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Læs konfiguration for hver konto...\n"
@@ -111,11 +95,11 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Navn"
 
@@ -127,30 +111,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Redigér"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Slet "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ned"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Op"
@@ -159,13 +143,6 @@ msgstr "Op"
 msgid " Set as default account "
 msgstr " Standard konto "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Luk"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Slet konto"
@@ -174,24 +151,15 @@ msgstr "Slet konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vil du virkelig slette denne konto?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nej"
 
@@ -237,29 +205,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kører: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Afsluttet: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Handlings input/output"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "Send "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Afbryd"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -270,11 +238,11 @@ msgstr ""
 "(`%%h' bliver erstattet af handlingen:)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Handlngens skjulte parametre"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -285,7 +253,7 @@ msgstr ""
 "(`%%h' bliver erstattet af handlingen:)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Handlingens bruger parameter"
 
@@ -293,13 +261,13 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -307,24 +275,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Afbryd"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Filer"
@@ -345,8 +296,8 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -364,7 +315,7 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
@@ -396,7 +347,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -405,12 +356,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -427,7 +378,7 @@ msgstr "/Ny _gruppe"
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -437,7 +388,7 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Redigér"
@@ -450,18 +401,18 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Navn:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Slet"
 
@@ -490,18 +441,6 @@ msgstr "Slet adresse(r)"
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nej"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -613,7 +552,7 @@ msgstr "Adressebog konverterings fejl"
 msgid "Addressbook Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Brugerflade"
 
@@ -657,359 +596,359 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Fejl"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Opretter alarm panel dialog...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Vis denne meddelelse igen"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rød"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Himmelblå"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Blå"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Grøn"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Brun"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Redigér/A_vanceret"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redigér/A_vanceret/Flyt et tegn baglæns"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redigér/A_vanceret/Flyt et tegn frem"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redigér/A_vanceret/Flyt et ord baglæns"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redigér/A_vanceret/Flyt et ord frem"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redigér/A_vanceret/Flyt til linie start"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redigér/A_vanceret/Flyt til linie slutning"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redigér/A_vanceret/Flyt til forrige linie"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redigér/A_vanceret/Flyt til næste linie"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn bagfra"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn forlæns"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redigér/A_vanceret/Slet et tegn baglæns"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redigér/A_vanceret/Slett et ord forlæns"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redigér/A_vanceret/Slet linie"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redigér/A_vanceret/Slet til linie slutning"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Redigéret]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Ny meddelelse%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1017,26 +956,26 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kunne ikke funde nøgle til den valgte nøgle id `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1047,138 +986,138 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "kan ikke skrive hoved\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME type"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Indsæt underskrift"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1189,66 +1128,66 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Afbrudt proces gruppe ID: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Midlertidig fil: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Instast: fra monitor process\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Kunne ikke starte ekstern editor\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Kunne ikke gemme fil\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Fejl i læsning fra Pipe\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Slet meddelelse"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Slet"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "til Kladde"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Erstat"
 
@@ -1256,77 +1195,76 @@ msgstr "Erstat"
 msgid "Edit address"
 msgstr "Redigér adresse"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Tilføj ny person"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Redigér person detaljer"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "En e-post adresse skan indtastes"
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Et navn og en værdi skal indtastes."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Redigér person data"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Vis navn"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Efternavn"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Fornavn"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Alias"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Op"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Ned"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Ændre"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Tøm"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Værdi"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Grund data"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Bruger egenskaber"
 
@@ -1342,7 +1280,7 @@ msgstr "Filen er ikke i korrekt adressebogs format"
 msgid "Could not read file."
 msgstr "Kunne ikke læse fil."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Redigér adressbog"
 
@@ -1355,7 +1293,7 @@ msgstr " Check fil "
 msgid "File"
 msgstr "Fil"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Tilføj ny adressebog"
 
@@ -1387,32 +1325,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Mulige adresser"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flyt e-post adresse fra eller til gruppe med pil tasterne"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Redigér gruppendetaljer"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Tilføj gruppe"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Redigér mappe"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -1424,11 +1362,11 @@ msgstr "Filen er ikke i JPilot format."
 msgid "Select JPilot File"
 msgstr "Vælg JPilot fil"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1437,7 +1375,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Yderligere e-post adresser"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Tilføj ny JPilot indtastning"
 
@@ -1445,63 +1383,63 @@ msgstr "Tilføj ny JPilot indtastning"
 msgid "Connected successfully to server"
 msgstr "Forbundet til server"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ignen forbindelse til server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Redigér LDAP server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Host navn"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Check server"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Søge base"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Søge kriterium"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Nulstil "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Binde DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Binde adgangskode"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Enkelt"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Udvidet"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Tilføj ny LDAP server"
 
@@ -1513,7 +1451,7 @@ msgstr "LDAP Redigér - Suchbasis wählen"
 msgid "Available Search Base(s)"
 msgstr "Vorhandene Suchbasen"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Konnte Suchbasen nicht vom Server lesen - bitte manuell setzen"
 
@@ -1525,11 +1463,11 @@ msgstr "Datei ist nicht im VCard-Format."
 msgid "Select vCard File"
 msgstr "VCard-Datei wählen"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Redigér vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Tilføj ny VCard"
 
@@ -1558,10 +1496,10 @@ msgstr " Vælg... "
 msgid "Select exporting file"
 msgstr "Vælg fil til export"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
 
@@ -1569,41 +1507,41 @@ msgstr "kunne ikke gemme konfiguration til fil\n"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -1666,65 +1604,65 @@ msgstr "Ulæst"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Gendanner alle mappe træer..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1734,16 +1672,16 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1752,24 +1690,24 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1778,34 +1716,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -1837,10 +1775,6 @@ msgstr "Meddelelser"
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Genopfrisk"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "modereret"
@@ -1853,15 +1787,15 @@ msgstr "kun læses"
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Afsluttet."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Nyhedsgruppe(r) modtaget (%s læst)"
@@ -1878,11 +1812,11 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -2117,7 +2051,7 @@ msgstr "Egensgab Navn"
 msgid "Attribute"
 msgstr "Egenskab"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Vælg"
 
@@ -2141,7 +2075,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Næste"
 
@@ -2157,138 +2091,138 @@ msgstr "Egenskaber"
 msgid "Finish"
 msgstr "Slut"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2297,28 +2231,28 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2327,11 +2261,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2340,16 +2274,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -2367,7 +2301,7 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2376,11 +2310,11 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread er ikke understøttet i glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2388,16 +2322,16 @@ msgstr ""
 "GnuPG er ike korrekt installeret eller i for gammel version\n"
 "OpenPGP ikke mulig."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2407,23 +2341,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2431,40 +2365,40 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3114,58 +3048,58 @@ msgstr "/_Hjælp/_OSS/_Italiensk"
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ændre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3175,16 +3109,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3193,144 +3127,144 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Næste ulæste"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3432,10 +3366,6 @@ msgstr "Stor / små forskel"
 msgid "Backward search"
 msgstr "Søg baglæns"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Søg"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Søgning fejlede"
@@ -3460,28 +3390,28 @@ msgstr "Søgning afsluttet"
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Gem som"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Overskrive eksisterende fil?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3490,7 +3420,7 @@ msgstr ""
 "Indtast udkrift kommando:\n"
 "(`%s' bliver erstattat af fil navn)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3550,7 +3480,7 @@ msgstr "Opretter MIME visning...\n"
 msgid "MIME Type"
 msgstr "MIME type"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3562,15 +3492,15 @@ msgstr "Vedhæftet"
 msgid "Select \"Check signature\" to check"
 msgstr "Vælg \"Check signatur\""
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Kan ikke gemme del af multipart meddelelse."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Åbn med"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3579,7 +3509,7 @@ msgstr ""
 "Indtast kommando til til åbning af fil:\n"
 "(`%s' bilver erstattet med fil navn)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME visnings kommando ugyldig: `%s'"
@@ -3685,15 +3615,15 @@ msgstr "Fejl ved afsendelse\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fejl ved afsendelse af e-post."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Adganssætning"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[ingen bruger ID]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3706,7 +3636,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s) an\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3714,72 +3644,68 @@ msgstr ""
 "Forkert adgangssætning! Prøv igen...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nødvendig APOP tid blev ikke fundet i velkomst\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Tid syntax fejl i velkomst\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol fejl\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ugyldig XOVER linie: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Sletter udløben meddelelse %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Sender meddelelse (%d / %d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "postkasse er låst\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "tid udløbet\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "kan ikke starte TLS session\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "fejl ved godkendelse\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Kommando tekst"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Fundet %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Anvend"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Åbner konti egenskaber...\n"
@@ -3801,11 +3727,11 @@ msgstr "Konto opsæt"
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privat"
 
@@ -3915,7 +3841,7 @@ msgstr "Hent alle meddelelser fra server"
 msgid "Receive size limit"
 msgstr "Modtagelses størrelse maks."
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "kB"
 
@@ -3935,7 +3861,7 @@ msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3943,7 +3869,7 @@ msgstr "Automatisk"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Hoved"
 
@@ -3959,7 +3885,7 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Redigér... "
 
@@ -4154,19 +4080,19 @@ msgstr ""
 "til at kode meddelelser. Derved overholdes RFC-3156 - MIME\n"
 "Security med OpenPGP ikke."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Handlingsopsæt"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menu navn:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Kommandolinie:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4206,43 +4132,43 @@ msgstr ""
 "   %h er en skjult, brugerdefineret parameter\n"
 "   %s er  den markérede del af beskeden"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr "Erstat "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Syntaks hjælp"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrerede handlinger"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nye)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menu navn ikke opsat."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Kolon ':' er ikke tilladt i menu navn."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menu navn er for langt."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menu navn og kommando linie er for lange."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4253,205 +4179,205 @@ msgstr ""
 "%s\n"
 "indeholder syntaks fejl."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Slet handling"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Vil du virkelig slette denne handling?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Opretter generelt opsæt vindue...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Generelt opsæt"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Vis"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Meddelelse"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Anden"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Eksternt program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Benyt eksternt program til modtagelse af e-post"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokal spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Modtager fra lokal spool"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filter ved modtagelse"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automatisk hentning af ny post"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "hver"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Hent e-post ved programstart"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Opdater alle mapper efter modtagelse"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Gem sendte meddelelser i Sendt"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Udgående tegnsæt"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Anbefalet)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4459,11 +4385,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegnsæt for den valgte locale."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Kodning af overførsel"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4471,115 +4397,115 @@ msgstr ""
 "Angiv Content-Transfer-Encoding anvendt hvis\n"
 "besked inholder andet end ASCII tegn."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Underskriftsdeling"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Tilføj automatisk"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Start automatisk ekstern editor"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Fortryd niveauer"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Del linier ved"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "tegn"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Del citat linier"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Del ved indtastning"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Del linier før afsendelse"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Vælg automatisk konto ved besvarelse"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citat af meddelelse i svar"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Svar knap starter svar til mail liste"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Svar format"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Citat tegn"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Videresend format"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Beskrivelse af symboler "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Oversæt hoved navn (fx. `Fra:', `Emne:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe længere end"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "bogstaver"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Vælg oplysninger i oversigt... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4587,64 +4513,64 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Blød scroll"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Ændre størrelse på vedhæftede billeder"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Udløb efter"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4652,250 +4578,250 @@ msgstr ""
 "(Sæt til '0' vil gemme adgangssætningen\n"
 " for hele sessionen)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangssætning indtastes"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
 msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overførsel"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Spørg ved afslut"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Tøm Slettet ved afslut"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Spørg før tømning"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i kø"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4919,11 +4845,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4937,7 +4863,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4949,15 +4875,15 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4967,31 +4893,31 @@ msgstr ""
 "Du kan også ændre hver menus genvejstast ved at taste enhver ved at placere\n"
 "mus over menu punkt og taste en tast."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Bruger defineret hoved opsæt"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Brugerdef. hoved"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Hoved navn ikke opsat."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Slet hoved"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Virklig slette denne hoved linie?"
 
@@ -4999,150 +4925,150 @@ msgstr "Virklig slette denne hoved linie?"
 msgid "Creating display header setting window...\n"
 msgstr "Opretter hoved opsæt vindue...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Hoved opsæt"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Hoved navn"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Viste hoved linier"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skulte hoved linier"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Vis alle uspecificerede hoved linier"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Hent hoved konfiguration...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Gem hoved konfiguration...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Denne hoved linie er allerede på listen."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filter opsæt"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Til:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopier..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Wollen Sie wirklich diese Regel Slet?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Alle hoved linier"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Meddelelse"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "indholder"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "indholder ikke"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5199,27 +5125,27 @@ msgstr "Udfør"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Mappe"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresse"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Hoved"
@@ -5390,7 +5316,7 @@ msgstr "Slet Skabelon"
 msgid "Do you really want to delete this template?"
 msgstr "Vil du virkelig slette denne Skabelon?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
@@ -5413,11 +5339,11 @@ msgstr "Fejl ved afsendelse af meddelelse %d i kø.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Opretter dialog...\n"
 
@@ -5429,97 +5355,67 @@ msgstr "fejl ved modtagelse af data.\n"
 msgid "Can't write to file.\n"
 msgstr "Kan ikke skrive til fil.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Hovsa: Underskrift ikke verificeret"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Underskrift ikke fundet"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Underskrift OK"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "DÅRLIG underskrift"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Ingen offentlig nøgle til verificering af denne underskrift"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Fejl ved verificering af underskrift"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Forskellige resultater for underskrifter"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Fejl: ukendt status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "God underskrift fra \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "DÅRLIG underskrift fra \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Kan ikke finde bruger ID for denne nøgle."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Underskrift fra %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Nøgle fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Fejl ved verificering af underskrift"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Vælg nøgle for '%s' "
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Samler informationen for '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Vælg nøgle"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Nøgle ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Tilføj nøgle"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Indtast anden bruger eller nøgle ID:"
 
+#: src/select-keys.c:485
+#, fuzzy
+msgid "Trust key"
+msgstr "Genvejstast"
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Hoved ugyldigt på meddelelse i kø.\n"
@@ -5609,15 +5505,78 @@ msgstr ""
 "Du kan benytte en eksisterende mailbox i MH format.\n"
 "Hvis du ikke har, så væld OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Undersøger signatur"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s fra \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Underskrift ikke fundet"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "God underskrift fra \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Underskrift OK"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Underskrift fra %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "DÅRLIG underskrift fra \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "DÅRLIG underskrift"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Ingen offentlig nøgle til verificering af denne underskrift"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH ikke tilgænglig\n"
@@ -5821,260 +5780,260 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Opretter oversigt...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Bearbejder markéring"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Markérer alle meddelelser..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Fjerner tråde til udførelse..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "filen %s eksisterer allerede\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Opretter tekst vindue...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "For at gemme denne del, åbn menuen med  "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "højre mustast og vælg `Gem som...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6082,11 +6041,11 @@ msgstr ""
 "eller tast `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "For at vise denne del som tekst, vælg "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6094,35 +6053,35 @@ msgstr ""
 "`Vis som tekst', eller tast `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "For at åbne denne del med et eksternt program, vælg "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Åbn' eller `Åbn med...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "eller doppelt klik, eller tryk på den midterste mustast, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "eller tast `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Signaturen er endnu ikke undersøgt.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "For at checke det, åbn menuen med\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "højre mustast og vælg `Check signatur'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6155,6 +6114,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Luk"
+
+#~ msgid "Cancel"
+#~ msgstr "Afbryd"
+
+#~ msgid "No"
+#~ msgstr "Nej"
+
+#~ msgid "Refresh"
+#~ msgstr "Genopfrisk"
+
+#~ msgid "Search"
+#~ msgstr "Søg"
+
+#~ msgid "Apply"
+#~ msgstr "Anvend"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Hovsa: Underskrift ikke verificeret"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Forskellige resultater for underskrifter"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Fejl: ukendt status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Nøgle fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Fundet mærke: %s\n"
 
@@ -6607,9 +6602,6 @@ msgstr "fejl ved skrivning til %s.\n"
 #~ msgid "/_View/U_nthread view"
 #~ msgstr "/_Vis/_Utrådet"
 
-#~ msgid "Shortcut key"
-#~ msgstr "Genvejstast"
-
 #~ msgid " Apply "
 #~ msgstr " Anvend "
 
diff --git a/po/de.po b/po/de.po
index d063e4e7..63a4e101 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-11-02 00:41+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann DOT m AT icg-online DOT de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -66,22 +66,6 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen für jeden Account...\n"
@@ -116,11 +100,11 @@ msgstr ""
 "in der `G'-Spalte, um den Nachrichten-Empfang bei `Hole alle' einzuschalten."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Name"
 
@@ -132,30 +116,30 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Löschen "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ab"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Auf"
@@ -164,13 +148,6 @@ msgstr "Auf"
 msgid " Set as default account "
 msgstr " Standardaccount "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Schließen"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Account löschen"
@@ -179,24 +156,15 @@ msgstr "Account löschen"
 msgid "Do you really want to delete this account?"
 msgstr "Wollen Sie diesen Account wirklich löschen?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nein"
 
@@ -242,29 +210,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Laufen: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Aktionen Ein-/Ausgabe"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "Senden "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Abbrechen"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -275,11 +243,11 @@ msgstr ""
 "(`%%h' wird durch den Parameter ersetzt)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Aktionen verstecken den Parameter"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -290,7 +258,7 @@ msgstr ""
 "(`%%u' wird durch den Parameter ersetzt)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Aktionen Benutzer-Parameter"
 
@@ -298,13 +266,13 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -312,24 +280,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Datei"
@@ -350,8 +301,8 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -369,7 +320,7 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
@@ -401,7 +352,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -410,12 +361,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -432,7 +383,7 @@ msgstr "/Neue _Gruppe"
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -442,7 +393,7 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
@@ -455,18 +406,18 @@ msgstr "/_Löschen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Name:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Löschen"
 
@@ -495,18 +446,6 @@ msgstr "Adresse(n) löschen"
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nein"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -625,7 +564,7 @@ msgstr "Adressbuch-Konvertierungs-Fehler"
 msgid "Addressbook Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
@@ -669,351 +608,351 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Fehler"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Erstelle Alarmpanel-Dialog...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Zeige diese Nachricht das nächste mal an"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rot"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Himmelblau"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Blau"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Grün"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Braun"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Keine"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/In Ent_wurfablage speichern"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/_Beschleunigen"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Zeichen zurück"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Zeichen vor"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Wort zurück"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Ein Wort vor"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zum Anfang der Zeile"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zum Ende der Zeile"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zur vorherigen Zeile"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zur nächsten Zeile"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeichen links vom Cursor löschen"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeichen rechts vom Cursor löschen"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/_Beschleunigen/Wort links vom Cursor löschen"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/_Beschleunigen/Wort rechts vom Cursor löschen"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/_Beschleunigen/Zeile löschen"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/_Beschleunigen/Bis zum Ende der Zeile löschen"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschlüsseln"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [in Bearbeitung]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1021,26 +960,26 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kein Schlüssel für die aktuelle gewählte Schlüssel-ID vorhanden `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1051,138 +990,138 @@ msgstr ""
 "(von %s zu %s).\n"
 "Trotzdem senden?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "kann Kopfzeilen nicht schreiben\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME-Typ"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1193,66 +1132,66 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Gruppen ID: %d des terminierten Prozesses"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporäre Datei: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom Überwachungsprozess\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Kann externen Editor nicht ausführen\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Kann nicht in Datei schreiben\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Lesen von Pipe fehlgeschlagen\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "zum Entwurf"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone `%s' übernehmen ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Ersetzen"
 
@@ -1260,77 +1199,76 @@ msgstr "Ersetzen"
 msgid "Edit address"
 msgstr "Adresse bearbeiten"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Personen-Details bearbeiten"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Eine E-Mail-Adresse muss angegeben werden."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Ein Name und ein Wert müssen angegeben werden."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Personen-Daten bearbeiten"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Namen anzeigen"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Spitzname"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-Mail Adresse"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Auf"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Ab"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Ändern"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Wert"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Grunddaten"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Benutzer Eigenschaften"
 
@@ -1346,7 +1284,7 @@ msgstr "Datei hat kein korrektes Adressbuchformat"
 msgid "Could not read file."
 msgstr "Kann Datei nicht lesen."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Adressbuch bearbeiten"
 
@@ -1359,7 +1297,7 @@ msgstr " Datei überprüfen "
 msgid "File"
 msgstr "Datei"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Neues Adressbuch hinzufügen"
 
@@ -1391,32 +1329,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Vorhandene Adressen"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Bewege E-Mail-Adresse zu oder von einer Gruppe mit den Pfeiltasten"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Gruppendetails bearbeiten"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Ablage bearbeiten"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -1428,11 +1366,11 @@ msgstr "Datei ist nicht im JPilot-Format."
 msgid "Select JPilot File"
 msgstr "Wähle JPilot-Datei"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1441,7 +1379,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Zusätzliche E-Mail-Adresseinträge"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Neuen JPilot-Eintrag hinzufügen"
 
@@ -1449,63 +1387,63 @@ msgstr "Neuen JPilot-Eintrag hinzufügen"
 msgid "Connected successfully to server"
 msgstr "Erfolgreich mit Server verbunden"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Keine Verbindung mit Server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "LDAP-Server bearbeiten"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Server überprüfen "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Such-Basis"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Suchkriterium"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Rücksetzen "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Verbinde DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Verbinde Kennwort"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (Sek.)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Einfach"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Erweitert"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Neuen LDAP-Server hinzufügen"
 
@@ -1517,7 +1455,7 @@ msgstr "LDAP bearbeiten - Suchbasis wählen"
 msgid "Available Search Base(s)"
 msgstr "Vorhandene Suchbasen"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Konnte Suchbasen nicht vom Server lesen - bitte manuell setzen"
 
@@ -1529,11 +1467,11 @@ msgstr "Datei ist nicht im vCard-Format."
 msgid "Select vCard File"
 msgstr "vCard-Datei wählen"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "VCard-Eintrag bearbeiten"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Neuen vCard-Eintrag hinzufügen"
 
@@ -1562,10 +1500,10 @@ msgstr " Auswählen... "
 msgid "Select exporting file"
 msgstr "Wähle exportierte Datei"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
 
@@ -1573,41 +1511,41 @@ msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage `%s' existiert bereits."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage `%s' nicht erstellen."
@@ -1669,64 +1607,64 @@ msgstr "Ungelesen"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Alle Ablagenbäume erneuern..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in `%s' ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1736,16 +1674,16 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1754,24 +1692,24 @@ msgstr ""
 "Alle Ablagen und Nachrichten in `%s' werden gelöscht.\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage `%s' nicht entfernen."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1780,34 +1718,34 @@ msgstr ""
 "Mailbox `%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account `%s' wirklich löschen?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup `%s' wirklich löschen?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account `%s' wirklich löschen?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -1839,10 +1777,6 @@ msgstr "Nachrichten"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Erneuern"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderiert"
@@ -1855,15 +1789,15 @@ msgstr "nur lesen"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Fertig."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppe(n) empfangen (%s gelesen)"
@@ -1880,11 +1814,11 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Kein Von)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -2118,7 +2052,7 @@ msgstr "Eigenschaftenname"
 msgid "Attribute"
 msgstr "Eigenschaft"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Wählen"
 
@@ -2142,7 +2076,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Nächste"
 
@@ -2158,133 +2092,133 @@ msgstr "Eigenschaften"
 msgid "Finish"
 msgstr "Ende"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2293,27 +2227,27 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2322,11 +2256,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2335,15 +2269,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -2361,7 +2295,7 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2370,11 +2304,11 @@ msgstr ""
 "Datei `%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird nicht unterstützt von Glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2382,16 +2316,16 @@ msgstr ""
 "GnuPG is nicht richtig installiert, oder die Version ist zu alt.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2401,23 +2335,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2425,40 +2359,40 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Aktionen-Einstellung"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3099,58 +3033,58 @@ msgstr "/_Hilfe/_FAQ/_Italian"
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Leere Papierkorb"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3160,16 +3094,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3178,141 +3112,141 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Nachricht löschen"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Nächste ungelesene Nachricht"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3414,10 +3348,6 @@ msgstr "Groß-/Kleinschreibung"
 msgid "Backward search"
 msgstr "Rückwärts suchen"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Suchen"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
@@ -3442,28 +3372,28 @@ msgstr "Suche beendet"
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Speichern als"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Überschreibe existierende Datei?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3472,7 +3402,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3532,7 +3462,7 @@ msgstr "Erstelle MIME-Ansicht...\n"
 msgid "MIME Type"
 msgstr "MIME Typ"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Text"
 
@@ -3544,15 +3474,15 @@ msgstr "Anhänge"
 msgid "Select \"Check signature\" to check"
 msgstr "Wähle \"Digitale Unterschrift überprüfen\" zum Überprüfen"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht speichern."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Öffnen mit"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3561,7 +3491,7 @@ msgstr ""
 "Geben Sie die Befehlszeile zum Öffnen der Datei an:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME Betrachterbefehl ist ungültig: `%s'"
@@ -3666,15 +3596,15 @@ msgstr "Fehler beim Senden\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fehler aufgetreten beim Senden eines Befehls\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Mantra"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[keine Benutzer-ID]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3687,7 +3617,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s) an\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3695,70 +3625,66 @@ msgstr ""
 "Falsches Mantra! Nochmal...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Erforderlichen APOP-Zeitstempel in der Begrüßung nicht gefunden\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3-Protokollfehler\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "ungültige UIDL-Antwort: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Lösche abgelaufene Nachricht %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Nachricht %d überspringen (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "Mailbox ist blockiert\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "Sitzungszeit abgelaufen\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "kann TLS-Sitzung nicht beginnen\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Fehler während der Beglaubigung\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "Befehl wird nicht unterstützt\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "Fehler während einer POP3-Sitzung\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Gefunden %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Übernehmen"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Öffne Accounteinstellungenfenster...\n"
@@ -3780,11 +3706,11 @@ msgstr "Accounteinstellungen"
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Accounteinstellungenfenster...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privat"
 
@@ -3894,7 +3820,7 @@ msgstr "Lade alle Nachrichten vom Server herunter"
 msgid "Receive size limit"
 msgstr "Grenze für Nachrichtengöße beim Empfang"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3914,7 +3840,7 @@ msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3923,7 +3849,7 @@ msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Hole alle' übeprüft ob neue Nachrichten für diesen Account vorhanden sind"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Kopfzeilen"
 
@@ -3939,7 +3865,7 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4134,19 +4060,19 @@ msgstr ""
 "für verschlüsselte Nachrichten zu verwenden. Es entspricht\n"
 "nicht dem RFC 3156 - MIME Security with OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Aktionen-Einstellung"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menüname:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Befehlszeile:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4184,43 +4110,43 @@ msgstr ""
 "   %h für ein versteckten Benutzer-Parameter\n"
 "   %s für die Textauswahl"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Ersetzen "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr "  Syntax Hilfe "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrierte Aktionen"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Neue)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menüname ist nicht gesetzt."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Doppelpunkt ':' ist im Menünamen nicht erlaubt."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menüname ist zu lang."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Befehlszeile ist nicht gesetzt."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menüname und Befehl sind zu lang."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4231,91 +4157,91 @@ msgstr ""
 "%s\n"
 "hat einen Syntax-Fehler."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Aktion löschen"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Erstelle Allgemeine-Einstellungenfenster...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Zitat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Weiteres"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Externes Programm"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Befehl"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokale Mailboxdatei"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Empfange aus lokaler Mailboxdatei"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtern beim Empfang"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Pfad zur Mailboxdatei"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automatische Aktualisierung"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "jedes"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Hole neue E-Mail beim Programmstart"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Aktualisiere alle lokalen Ablagen nach dem Empfang"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4323,115 +4249,115 @@ msgstr ""
 "Maximum an herunterzuladenden Artikeln\n"
 "(0 angeben für unbegrenzt)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Benutze externes Programm zum Senden"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Gesendete Nachrichten in Gesendet-Ablage speichern"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Ausgehender Zeichensatz"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4439,11 +4365,11 @@ msgstr ""
 "Wenn `Automatisch' gewählt ist, wird die optimale\n"
 "Zeichensatzkodierung für die aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Übertragungscodierung"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4451,115 +4377,115 @@ msgstr ""
 "Geben Sie die Inhalt-Übertragungs-Kodierung an\n"
 "wenn die Nachricht keine ASCII Zeichen enthält."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Automatisch einfügen"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Starte externen Editor automatisch"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Stufen der Rückgängigmachung"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Bei der Eingabe umbrechen"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Wähle automatisch den Account für die Antworten"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Zitiere Nachricht in der Antwort"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwort-Knopf führt Antwort an Mailing-Liste aus"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Antwort-Format"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Weiterleiten-Format"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Übersetze Kopfzeilennamen (wie `Von:', `Betreff:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Kürze Newsgroups länger als"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "Zeichen"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Einträge... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4567,65 +4493,65 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Größe angehängter Bilder in das Fenster einpassen"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr ""
 "Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem POPUP-"
 "Fenster an"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Läuft aus nach"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4633,37 +4559,37 @@ msgstr ""
 "('0' speichert das Mantra für die gesamte\n"
 "Sitzung)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer öffnen, wenn in der Ablageninhaltsansich ausgewählt"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster geöffnet "
 "werden"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4671,216 +4597,216 @@ msgstr ""
 "(Nachricht wird markiert bis zur Ausführung,\n"
 " wenn das ausgeschaltet ist)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schließen nach Beendigung"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen wählen... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4904,11 +4830,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4922,7 +4848,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4934,15 +4860,15 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Schriftauswahl"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4953,31 +4879,31 @@ msgstr ""
 "Menüeintrag\n"
 "ist, können Sie die Abkürzungstastenkombination jedes Menüeintrags ändern."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Benutzerdefinierte Kopfzeileneinstellungen"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Kopfzeilen löschen"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Wollen Sie wirklich diese Kopfzeile löschen?"
 
@@ -4985,143 +4911,143 @@ msgstr "Wollen Sie wirklich diese Kopfzeile löschen?"
 msgid "Creating display header setting window...\n"
 msgstr "Erstelle Kopfzeilen-Einstellungen-Fenster...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Kopfzeilen-Einstellungen"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Kopfzeilenname"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Angezeigte Kopfzeilen"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Versteckte Kopfzeilen"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Zeige alle unspezifizierten Kopfzeilen"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Lese Konfiguration zum Anzeigen der Kopfzeilen...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Schreibe Konfiguration zum Anzeigen der Kopfzeilen...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filtereinstellungen"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "An"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Anfang"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Ende"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Kopieren..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Lösche Regel"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Wollen Sie wirklich diese Regel löschen?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Wenn alle der folgenden Bedingungen zutriffen"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Die folgenden Aktionen ausführen:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "An oder Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Jede Kopfzeile"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Nachrichtenkrper"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Ergebnis des Befehls"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "enthalten"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "nicht enthalten"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "ist"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "ist nicht"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "entspricht Regex"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "entspricht nicht Regex"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "ist größer als"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "ist kleiner als"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "ist länger als"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "ist kürzer als"
 
@@ -5169,23 +5095,23 @@ msgstr "Befehl ausführen"
 msgid "Stop rule evaluation"
 msgstr "Beende Regelauswertung"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "Ablage:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "Adresse:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Kopfzeilen:"
 
@@ -5354,7 +5280,7 @@ msgstr "Schablone löschen"
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie diese Schablone wirklich löschen?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
@@ -5377,11 +5303,11 @@ msgstr "Senden wartender Nachricht %d fehlgeschlagen.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Erstelle Fortschrittsdialog...\n"
 
@@ -5393,98 +5319,66 @@ msgstr "Fehler beim Empfang von Daten.\n"
 msgid "Can't write to file.\n"
 msgstr "Kann nicht in Datei schreiben.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: digitale Unterschrift nicht verifiziert"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Keine digitale Unterschrift gefunden"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Gute digitale Unterschrift"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "SCHLECHTE digitale Unterschrift"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr ""
-"Kein öffentlicher Schlüssel zum Verifizieren der digitalen Unterschrift"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Fehler beim Verifizieren der digitalen Unterschrift"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Unterschiedliche Ergebnisse für Unterschriften"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Fehler: Unbekannter Status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Gute digitale Unterschrift von \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "SCHLECHTE digitale Unterschrift von \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Finde keine User-ID für diesen Schlüssel."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Digitale Unterschrift erstellt %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Schlüssel Fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Fehler beim Verifizieren der digitalen Unterschrift"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Wähle Schlüssel für '%s' "
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Sammle Informationen für '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Wähle Schlüssel"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Schlüüsel hinzufügen"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Eine andere Benutzer- oder Schlüssel-ID angeben:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Kopfzeilen wartender Nachricht ist defekt.\n"
@@ -5571,15 +5465,79 @@ msgstr ""
 "Sie können eine vorhandene Mailbox im MH-Format nutzen.\n"
 "Wenn Sie sich nicht sicher sind, wählen Sie OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Digitale Unterschrift überprüfen"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s von \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Keine digitale Unterschrift gefunden"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Gute digitale Unterschrift von \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Gute digitale Unterschrift"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Digitale Unterschrift erstellt %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "SCHLECHTE digitale Unterschrift von \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "SCHLECHTE digitale Unterschrift"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr ""
+"Kein öffentlicher Schlüssel zum Verifizieren der digitalen Unterschrift"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH nicht verfügbar\n"
@@ -5784,255 +5742,255 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Erstelle Ablageninhaltsansicht...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Weitersuchen"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Wähle alle Nachrichten..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Threads zur Ausführung aufheben..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "Datei %s existiert bereits\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Erstelle Textansicht...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Zum Speichern dieses Teiles, öffnen Sie das Kontextmenü mit der "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "rechten Maustaste und wählen Sie `Speichern als...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6040,11 +5998,11 @@ msgstr ""
 "oder drücken die `y'-Taste.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Zum Anzeigen dieses Teiles der Nachricht als Text, wählen Sie "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6052,35 +6010,35 @@ msgstr ""
 "`Darstellung als Text', oder drücken Sie die `t'-Taste.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Zum Öffnen dieses Teiles mit einem externen Programm, wählen Sie "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Öffnen' oder `Öffnen mit...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "oder Doppel-Klick, oder drücken Sie die mittlere Maustaste, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "oder die `l'-Taste."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Diese digitale Unterschrift wurde noch nicht geprüft.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Zum Überprüfen, öffnen Sie das Kontextmenü mit der\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "rechten Maustaste und `Digitale Unterschrift überprüfen' wählen.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6116,6 +6074,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Schließen"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
+#~ msgid "Refresh"
+#~ msgstr "Erneuern"
+
+#~ msgid "Search"
+#~ msgstr "Suchen"
+
+#~ msgid "Apply"
+#~ msgstr "Übernehmen"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: digitale Unterschrift nicht verifiziert"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Unterschiedliche Ergebnisse für Unterschriften"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Fehler: Unbekannter Status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Schlüssel Fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Gefundene Zeichen: %s\n"
 
diff --git a/po/el.po b/po/el.po
index ef36b7f2..974c2f43 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -66,22 +66,6 @@ msgstr ""
 "Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 Temple Place - "
 "Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Διαβάζω τις ρυθμίσεις για κάθε λογαριασμό...\n"
@@ -114,11 +98,11 @@ msgid ""
 msgstr ""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Όνομα"
 
@@ -130,30 +114,30 @@ msgstr "Πρωτόκολλο"
 msgid "Server"
 msgstr "Εξυπηρέτης"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Διαγραφή"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Πάνω"
@@ -162,13 +146,6 @@ msgstr "Πάνω"
 msgid " Set as default account "
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Κλείσιμο"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Διαγραφή λογαριασμού"
@@ -177,24 +154,15 @@ msgstr "Διαγραφή λογαριασμού"
 msgid "Do you really want to delete this account?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Όχι"
 
@@ -235,31 +203,31 @@ msgid ""
 "%s"
 msgstr "Δεν μπόρεσα να εκτελέσω την εξωτερική εντολή: %s\n"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1094
+#: src/action.c:1095
 #, fuzzy
 msgid " Send "
 msgstr "Αποστολή"
 
-#: src/action.c:1105
+#: src/action.c:1106
 #, fuzzy
 msgid "Abort"
 msgstr "Σχετικά"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -269,11 +237,11 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής εκτύπωσης:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -283,7 +251,7 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής εκτύπωσης:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -291,13 +259,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο βιβλίο"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Σχόλια"
 
@@ -305,24 +273,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή καταλόγου βιβλίου διευθύνσεων"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/Αρχείο"
@@ -345,8 +296,8 @@ msgstr "/Αρχείο/Νέο _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/Αρχείο/Νέος εξυπηρετητής"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -364,7 +315,7 @@ msgstr "/Αρχείο/Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/Αρχείο/Κλείσιμο"
 
@@ -396,7 +347,7 @@ msgstr "/Διεύθυνση/Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/Διεύθυνση/Διαγραφή"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 #, fuzzy
 msgid "/_Tools"
@@ -407,12 +358,12 @@ msgstr "/Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου mbox..."
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Βοήθεια"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Βοήθεια/Σχετικά"
@@ -429,7 +380,7 @@ msgstr "/Νέα ομάδα"
 msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/Νέος κατάλογος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
@@ -452,18 +403,18 @@ msgstr "/Διαγραφή"
 msgid "E-Mail address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Όνομα:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -492,18 +443,6 @@ msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 msgid "Really delete the address(es)?"
 msgstr "Σίγουρα να διαγράψω την (τις) διεύθυνση (διευθύνσεις);"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Όχι"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -614,7 +553,7 @@ msgstr "Σφάλμα μετατροπής βιβλίου διευθύνσεων"
 msgid "Addressbook Conversion"
 msgstr "Μετατροπή βιβλίου διευθύνσεων"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Διεπαφή"
 
@@ -660,373 +599,373 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Δημιουργώ το διάλογο alert panel...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Να εμφανιστεί αυτό το μήνυμα την επόμενη φορά"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Πορτοκαλί"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Ροζ"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Ουρανί"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Μπλε"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Πράσινο"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Καφέ"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Τέλος"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/Προσθήκη..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/Αρχείο/Αποθήκευση"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Μήνυμα/Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Μήνυμα/Αποστολή αργότερα"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/Αρχείο/Προσάρτηση αρχείου"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/Αρχείο/Εισαγωγή αρχείου"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/Αρχείο/Εισαγωγή υπογραφής"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Επεξεργασία/Αναίρεση"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Επεξεργασία/Επανάληψη"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Επεξεργασία/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Επεξεργασία/Κοπή"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:483
+#: src/compose.c:479
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Επεξεργασία/Επικόλληση"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Επεξεργασία/Επιλογή όλων"
 
-#: src/compose.c:486
+#: src/compose.c:482
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/Επεξεργασία/Αναίρεση"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Επεξεργασία/Αναδίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Επεξεργασία/Αναδίπλωση μακριών γραμμών"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:564
+#: src/compose.c:560
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:565
+#: src/compose.c:561
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/Απεικόνιση"
 
-#: src/compose.c:566
+#: src/compose.c:562
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:567
+#: src/compose.c:563
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/Απεικόνιση/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/Μήνυμα/Συνέχεια σε"
 
-#: src/compose.c:571
+#: src/compose.c:567
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/compose.c:573
+#: src/compose.c:569
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/Εργαλεία/Κατάλογος διευθύνσεων"
 
-#: src/compose.c:577
+#: src/compose.c:573
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/Αρχείο/Διαγραφή"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/Εργαλεία"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Επεξεργασία/Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Εκτέλεση"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Δεν μπορώ να λάβω το τμήμα κειμένου\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν μπορώ να βρω το μέγεθος του αρχείου %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι άδειο\n"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Τροποποιημένο]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "δεν μπορώ να πάρω την λίστα παραληπτών"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1034,26 +973,26 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Δεν μπορώ να αποθηκεύσω το μήνυμα στα εξερχόμενα."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "δεν μπορώ να αλλάξω το mode του αρχείου\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1061,145 +1000,145 @@ msgid ""
 "Send it anyway?"
 msgstr "Δεν μπορώ να αλλάξω το κωδικοσύνολο του μηνύματος."
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "δεν μπορώ να γράψω την κεφαλίδα\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "δεν μπορώ να αφαιρέσω το παλιό μήνυμα\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "βάζω το μήνυμα στην ουρά...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "δεν μπορώ να βάλω το μήνυμα στην ουρά\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Δημιουργώ το παράθυρο σύνθεσης...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "τύπος MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Προσάρτηση"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Προσάρτηση αρχείου"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Εισαγωγή υπογραφής"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Συνθέτης"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr ""
 "Τύλιξη\n"
 "γραμμής"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1210,67 +1149,67 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Τερματίστηκε process group id: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Προσωρινό αρχείο: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Σύνθεση: εισαγωγή από παρακολουθούμενη διεργασία\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Δεν μπόρεσα να καλέσω το εξωτερικό πρόγραμμα επεξεργασίας\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Δεν μπόρεσα να γράψω στο αρχείο\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Αποτυχία ανάγνωσης από το pipe\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Απόρριψη μηνύματος"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Απόρριψη"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "στα πρόχειρα"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 #, fuzzy
 msgid "Replace"
 msgstr "Απάντηση"
@@ -1280,77 +1219,76 @@ msgstr "Απάντηση"
 msgid "Edit address"
 msgstr "Επεξεργασία βιβλίου διευθύνσεων"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Προσθήκη νέου ατόμου"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Επεξεργασία λεπτομερειών ατόμου"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Πρέπει να δοθεί μία διεύθυνση mail."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Πρέπει να δοθεί ένα όνομα και μία τιμή."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Επεξεργασία στοιχείων ατόμου"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Εμφανιζόμενο όνομα"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Επίθετο"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Όνομα"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Παρωνύμιο"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Διεύθυνση e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Ψευδώνυμο"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Μετακίνηση Πάνω"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Τροποποίηση"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Τιμή"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Βασικά Στοιχεία"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr ""
 
@@ -1366,7 +1304,7 @@ msgstr "Το αρχείο δεν φαίνεται να είναι έγκυρο �
 msgid "Could not read file."
 msgstr "Δεν μπόρεσα να διαβάσω το αρχείο."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Επεξεργασία βιβλίου διευθύνσεων"
 
@@ -1379,7 +1317,7 @@ msgstr " Έλεγχος Αρχείου "
 msgid "File"
 msgstr "Αρχείο"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Προσθήκη νέου βιβλίου διευθύνσεων"
 
@@ -1411,34 +1349,34 @@ msgstr ""
 msgid "Available Addresses"
 msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Μετακίνηση των διευθύνσεων E-Mail προς ή από ομάδες με τα κουμπιά με τα "
 "βελάκια"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Επεξεργασία λεπτομερειών ομάδας"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Προσθήκη Νέας Ομάδας"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Επεξεργασία καταλόγου"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -1450,11 +1388,11 @@ msgstr "Το αρχείο δεν φαίνεται να είναι σε μορφ�
 msgid "Select JPilot File"
 msgstr "Επέλεξε αρχείο JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1463,7 +1401,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Πρόσθετες e-Mail διευθύνσεις"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Προσθήκη νέας εγγραφής JPilot"
 
@@ -1471,64 +1409,64 @@ msgstr "Προσθήκη νέας εγγραφής JPilot"
 msgid "Connected successfully to server"
 msgstr "Συνδέθηκα επιτυχώς στον εξυπηρέτη"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Δεν μπορώ να συνδεθώ στον εξυπηρετητή"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Επεξεργασία εξυπηρετητή LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Όνομα συστήματος"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Πόρτα"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Έλεγχος Εξυπηρέτη "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Αναζήτηση βάσης"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Κριτήρια αναζήτησης"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Μηδενισμός "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 #, fuzzy
 msgid "Bind Password"
 msgstr "Κωδικός"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Μέγιστος αριθμός εγγραφών"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Βασικά"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr ""
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Προσθήκη νέου εξυπηρέτη LDAP"
 
@@ -1540,7 +1478,7 @@ msgstr ""
 msgid "Available Search Base(s)"
 msgstr ""
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 
@@ -1554,12 +1492,12 @@ msgstr "Το αρχείο δεν φαίνεται να είναι σε μορφ�
 msgid "Select vCard File"
 msgstr "Επιλογή αρχείου VCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 #, fuzzy
 msgid "Edit vCard Entry"
 msgstr "Επεξεργασία εγγραφής VCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 #, fuzzy
 msgid "Add New vCard Entry"
 msgstr "Προσθήκη νέας εγγραφής VCard"
@@ -1589,10 +1527,10 @@ msgstr "Επιλογή... "
 msgid "Select exporting file"
 msgstr "Επιλογή αρχείου εξαγωγής"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "απέτυχα να γράψω τις ρυθμίσεις στο αρχείο\n"
 
@@ -1600,43 +1538,43 @@ msgstr "απέτυχα να γράψω τις ρυθμίσεις στο αρχε
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
@@ -1703,69 +1641,69 @@ msgstr "Αδιάβαστα"
 msgid "#"
 msgstr "αρ."
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 #, fuzzy
 msgid "Rebuilding all folder trees..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1775,16 +1713,16 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1793,24 +1731,24 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1819,35 +1757,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -1884,10 +1822,6 @@ msgstr "Μήνυμα"
 msgid "Type"
 msgstr "Τύπος MIME"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Ανανέωση"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr ""
@@ -1900,15 +1834,15 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Τέλος"
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups λήφθηκαν (%s διαβασμένα)"
@@ -1925,11 +1859,11 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
@@ -2176,7 +2110,7 @@ msgstr ""
 msgid "Attribute"
 msgstr ""
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Επιλογή"
 
@@ -2203,7 +2137,7 @@ msgstr ""
 msgid "Prev"
 msgstr "Επιλογές"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Επόμενο"
 
@@ -2220,195 +2154,195 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Περιμένω"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Λαμβάνω"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:535
+#: src/inc.c:536
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "H πιστοποίηση απέτυχε"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d νέο(α) μήνυμα(μηνύματα)\n"
 
-#: src/inc.c:612
+#: src/inc.c:613
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/inc.c:621
+#: src/inc.c:622
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "συνέβη σφάλμα καθώς λάμβανα την αλληλογραφία."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λαμβάνω νέα μηνύματα του λογαριασμού %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λαμβάνω τα νέα μηνύματα"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Συνδέομαι στον POP3 server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λαμβάνω τον αριθμό των νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λαμβάνω το μέγεθος των μηνυμάτων (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνω το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Διαγραφή μηνυμάτων από τον εξυπηρέτη όταν παραληφθούν"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 #, fuzzy
 msgid "Can't write file."
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 #, fuzzy
 msgid "Socket error."
 msgstr "σφάλμα πρωτοκόλλου\n"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Πιστοποίηση"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Λήψη νέου mail"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λαμβάνω νέα μηνύματα από το %s στο %s...\n"
@@ -2426,7 +2360,7 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2435,11 +2369,11 @@ msgstr ""
 "Το αρχείο `%s' υπάρχει ήδη.\n"
 "Δεν μπορώ να δημιουργήσω τον κατάλογο."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "το g_thread δεν υποστηρίζεται από την glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2448,81 +2382,81 @@ msgstr ""
 "Το GnuPG δεν έχει εγκατασταθεί σωστά.\n"
 "Απενεργοποιείται η υποστήριξη OpenPGP."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:411
+#: src/main.c:429
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει παράθυρο σύνθεσης μηνύματος. Να κλείσω;"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "ένα άλλο Sylpheed τρέχει ήδη.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Γράφω τις ρυθμίσεις των φίλτρων...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3247,58 +3181,58 @@ msgstr "/Βοήθεια/_Manual/Αγγλικό"
 msgid "/_Help/---"
 msgstr "/Βοήθεια/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Προσθήκη mailbox"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3308,16 +3242,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον mailbox, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το mailbox `%s' υπάρχει ήδη"
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3326,151 +3260,151 @@ msgstr ""
 "Η δημιουργία του mailbox απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί. "
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Λήψη"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Λήψη νέου mail"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr ""
 "Λήψη\n"
 "όλων"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Λήψη νέου mail από όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Απάντηση"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Απάντηση στο μήνυμα"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr ""
 "Απάντηση\n"
 "όλων"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Απάντηση σε όλους"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Προώθηση μηνύματος"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Εκτέλεση σημειωμένης εργασίας"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Επόμενο αδιάβαστο μήνυμα"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Επιλογές"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 #, fuzzy
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Λογ/σμός"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Ρυθμίσεις λογαριασμού"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Έξοδος από αυτό το πρόγραμμα;"
 
@@ -3571,10 +3505,6 @@ msgstr "Διαχωρισμός πεζών/κεφαλαίων"
 msgid "Backward search"
 msgstr "Αναζήτηση προς τα πίσω"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Αναζήτηση"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Η αναζήτηση απέτυχε"
@@ -3601,28 +3531,28 @@ msgstr "Η αναζήτηση τελείωσε"
 msgid "Creating message view...\n"
 msgstr "Δημιουργώ απεικόνιση μηνύματος...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Αποθήκευση ως"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Εγγραφή από πάνω"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Εγγραφή πάνω από το υπάρχον αρχείο;"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3631,7 +3561,7 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής εκτύπωσης:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3691,7 +3621,7 @@ msgstr "Δημιουργία απεικόνισης MIME...\n"
 msgid "MIME Type"
 msgstr "Τύπος MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Κείμενο"
 
@@ -3704,15 +3634,15 @@ msgstr "Προσάρτηση"
 msgid "Select \"Check signature\" to check"
 msgstr "Επιλέξτε \"Έλεγχος υπογραφής\" για έλεγχο"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Δεν μπορώ να αποθηκεύσω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Άνοιγμα με"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3721,7 +3651,7 @@ msgstr ""
 "Εισάγετε την γραμμή εντολής για το άνοιγμα του αρχείου:\n"
 "(Το `%s' θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
@@ -3827,15 +3757,15 @@ msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 msgid "Error occurred while sending command\n"
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Κωδική φράση"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[χωρίς user id]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3848,7 +3778,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3856,74 +3786,70 @@ msgstr ""
 "Λάθος κωδική φράση! Ξαναπροσπαθήστε...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Προαπαιτούμενη timestamp APOP δεν βρέθηκε στο χαιρετισμό\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Συντακτικό σφάλμα timestamp στο χαιρετισμό\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Σφάλμα πρωτοκόλλου POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "μη έγκυρη γραμμή xover: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, fuzzy, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "διαγράφω το μήνυμα %d...\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, fuzzy, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: src/pop.c:660
+#: src/pop.c:655
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Ρυθμίσεις Mailbox"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "Χρήση εντολής STARTTLS για την έναρξη ασφαλούς (SSL) συνόδου"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Εντολή"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "Προέκυψε σφάλμα στην εξακρίβωση\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Βρέθηκε %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Εφαρμογή"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Ανοίγω το παράθυρο επιλογών των λογαριασμών...\n"
@@ -3946,11 +3872,11 @@ msgstr "Κοινές Επιλογές"
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργώ το παράθυρο επιλογών του λογαριασμού...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Μυστικότητα"
 
@@ -4063,7 +3989,7 @@ msgstr "Λήψη όλων των μηνυμάτων από τον εξυπηρέ
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -4087,7 +4013,7 @@ msgstr ""
 msgid "Authentication method"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Αυτόματη"
 
@@ -4096,7 +4022,7 @@ msgstr "Αυτόματη"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Επικεφαλίδα"
 
@@ -4112,7 +4038,7 @@ msgstr "Δημιουργία Message-ID"
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "Επεξεργασία..."
 
@@ -4310,22 +4236,22 @@ msgid ""
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Γράφω τις ρυθμίσεις των φίλτρων...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 #, fuzzy
 msgid "Menu name:"
 msgstr "Πλήρες όνομα"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 #, fuzzy
 msgid "Command line:"
 msgstr "Εντολή"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4347,47 +4273,47 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Απάντηση"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr ""
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 #, fuzzy
 msgid "Registered actions"
 msgstr "Ορισμένοι κανόνες"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Νέο)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 #, fuzzy
 msgid "Menu name is not set."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 #, fuzzy
 msgid "Command line not set."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4395,95 +4321,95 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 #, fuzzy
 msgid "Delete action"
 msgstr "Διαγραφή λογαριασμού"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 #, fuzzy
 msgid "Do you really want to delete this action?"
 msgstr "Θέλετε πράγματι να διαγράψετε αυτό το λογαριασμό;"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Δημιουργία παραθύρου κοινών επιλογών...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Κοινές επιλογές"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 #, fuzzy
 msgid "Quote"
 msgstr "Ουρά"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Εμφάνιση"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Άλλα"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Εξωτερικό πρόγραμμα"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr ""
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr ""
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Φιλτράρισμα κατά τη λήψη"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Αυτόματος έλεγχος για νέα mail"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 #, fuzzy
 msgid "every"
 msgstr "Ποτέ"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "λεπτά"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Έλεγχος για νέο mail στην αρχή"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Ενημέρωση όλων των τοπικών καταλόγων μετά την λήψη"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Νέα"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 #, fuzzy
 msgid ""
 "Maximum number of articles to download\n"
@@ -4492,352 +4418,352 @@ msgstr ""
 "Μέγιστος αριθμός άρθρων που θα ληφθούν\n"
 "(χωρίς όριο αν θέσετε 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Αποθήκευση σταλμένων μηνυμάτων στο outbox"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Κωδικοσελίδα εξερχομένων"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Αυτόματο (Προτεινόμενο)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Βαλτικής (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Βαλτικής (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
 msgstr ""
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Διαχωρισμός υπογραφής"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Αυτόματη εισαγωγή"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Αυτόματη χρήση εξωτερικού προγράμματος επεξεργασίας"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Τύλιξη μηνυμάτων στους"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "χαρακτήρες"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Τύλιξη παράθεσης"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Τύλιξη πριν την αποστολή"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Αυτόματη επιλογή λογαριασμού για τις απαντήσεις"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Παράθεση του μηνύματος όταν απαντάτε"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Απάντηση σε όλους"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 #, fuzzy
 msgid "Reply format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Σήμα παράθεσης"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 #, fuzzy
 msgid "Forward format"
 msgstr "Προώθηση"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Περιγραφή συμβόλων"
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr ""
 "Μετέφρασε τα ονόματα των πεδίων της επικεφαλίδας (όπως το `From:' σε `Από')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του καταλόγου"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 #, fuzzy
 msgid "letters"
 msgstr "Διαγραφή"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Απεικόνιση Περίληψης"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Εμφάνιση του παραλήπτη στη στήλη `Αποστολέα' αν ο αποστολέας είστε εσείς"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Ορισμός εμφανιζόμενων στοιχείων περίληψης... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Display 2-byte alphabet and numeric with 1-byte character"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Διάστημα γραμμών"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Μισή σελίδα"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Ομαλή κύλιση"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Κατά βήματα"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Αυτόματος έλεγχος υπογραφών"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Εμφάνιση του αποτελέσματος του ελέγχου σε ξεχωριστό παράθυρο"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 #, fuzzy
 msgid "Expired after"
 msgstr ""
 "Αποστολή\n"
 "αργότερα"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 #, fuzzy
 msgid "minute(s) "
 msgstr "λεπτά"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
 msgstr ""
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Grab input while entering a passphrase"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Άνοιγμα του πρώτου αδιάβαστου μηνύματος κατά τη μετακίνηση σε ένα κατάλογο"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/Μήνυμα/Άνοιγμα σε νέο παράθυρο"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Μετακίνηση στον κατάλογο εισερχομένων μετά τη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 #, fuzzy
 msgid ""
 "(Messages will be marked until execution\n"
@@ -4846,219 +4772,219 @@ msgstr ""
 "(Τα μηνύματα απλά θα σημανθούν μέχρι την εκτέλεση\n"
 "αν αυτό είναι απεπιλεγμένο)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Πάντα"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Εμφάνιση διαλόγου λήψης"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Εξωτερικό πρόγραμμα σύνθεσης (το %s θα αντικατασταθεί με το όνομα αρχείου)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Κατά την έξοδο"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Επιβεβαίωση εξόδου"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Επιβεβαίωση πριν το άδειασμα"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "η συντομογραφία ημέρας της εβδομάδας"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της μέρας της εβδομάδας"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "η συντομογραφία του μήνα"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμώμενη ημερομηνία και ώρα για το τρέχον locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "ο αριθμός αιώνα (έτη / 100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 24ωρο ρολόι"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός χρησιμοποιώντας 12ωρο ρολόι"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του έτους ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "τα τελευταία δύο ψηφία του έτους"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "Η ζώνη ώρας ή όνομα, ή συνμτομογραφία"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Όρισμος χρωμάτων μηνύματος"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Παρατιθέμενο κείμενο - Πρώτο επίπεδο"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Παρατιθέμενο κείμενο - Δεύτερο επίπεδο"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Παρατιθέμενο κείμενο - Τρίτο επίπεδο"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Επιλογή χρώματος πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Επιλογή χρώματος δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Επιλογή χρώματος τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5083,11 +5009,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5096,7 +5022,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5104,48 +5030,48 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Επιλογή γραμματοσειράς"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 #, fuzzy
 msgid "Key bindings"
 msgstr "Στέλνω"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 #, fuzzy
 msgid "Default"
 msgstr "Προκαθορισμένο κλειδί υπογραφής"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr ""
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Ρυθμίσεις ειδικής κεφαλίδας"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Ειδική κεφαλίδα"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Διαγραφή κεφαλίδας"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
@@ -5153,150 +5079,150 @@ msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφ
 msgid "Creating display header setting window...\n"
 msgstr "Δημιουργώ το παράθυρο εμφάνισης ρυθμίσεων επικεφαλίδας...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Ορισμός εμφάνισης κεφαλίδας"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Όνομα κεφαλίδας"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Εμφανισθείσες κεφαλίδες"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Κρυμμένες κεφαλίδες"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Εμφάνιση όλων των μη ορισμένων κεφαλίδων"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Διαβάζω τις ρυθμίσεις για εμφάνιση κεφαλίδων...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Γράφω τις ρυθμίσεις για εμφάνιση κεφαλίδων...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Αυτή η κεφαλίδα είναι ήδη στη λίστα."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Ρυθμίσεις φίλτρων"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Προς:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/Αντιγραφή..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Διαγραφή κανόνα"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτός ο κανόνας;"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Διαγραφή κανόνα"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Όλες οι κεφαλίδες"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Μήνυμα"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "περιέχει"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "δεν περιέχει"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5353,27 +5279,27 @@ msgstr "Εκτέλεση"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Κατάλογος"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Διεύθυνση"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Επικεφαλίδα"
@@ -5555,7 +5481,7 @@ msgstr "Διαγραφή μηνύματος"
 msgid "Do you really want to delete this template?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 #, fuzzy
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
@@ -5579,11 +5505,11 @@ msgstr "Η αποστολή του μηνήματος ουράς %d απέτυχ
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Δημιουργώ διάλογο προόδου...\n"
 
@@ -5595,98 +5521,67 @@ msgstr "προέκυψε σφάλμα κατά την λήψη δεδομένω�
 msgid "Can't write to file.\n"
 msgstr "Δεν μπορώ να γράψω σε αρχείο.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Ουπς. Η υπογραφή δεν εξακριβώθηκε"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Δεν βρέθηκε υπογραφή"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Αποδεκτή υπογραφή"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "Λάθος υπογραφή"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Δεν υπάρχει δημόσιο κλειδί για να εξακριβώσω αυτή την υπογραφή"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Σφάλμα κατά την εξακρίβωση της υπογραφής"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Διαφορετικά αποτελέσματα για τις υπογραφές"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Σφάλμα: Άγνωστη κατάσταση"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Αποδεκτή υπογραφή από \"%s\""
-
-#: src/rfc2015.c:175
-#, fuzzy, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Λάθος υπογραφή από \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Δεν μπορώ να βρω user ID για αυτό το κλειδί"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "επίσης γνωστός ως \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Υπογραφή δημιουργήθηκε %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Αποτύπωμα κλειδιού: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Σφάλμα κατά την εξακρίβωση της υπογραφής"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Παρακαλώ επιλέξτε κλειδί για `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Συλλέγω πληροφορίες για `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Επέλεξε κλειδιά"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Key ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Τιμή"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Προσθήκη κλειδιού"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 #, fuzzy
 msgid "Enter another user or key ID:"
 msgstr "Εισαγωγή άλλου χρήστη ή key ID\n"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Η κεφαλίδα του εν αναμονή μηνύματος δεν είναι πλέον έγκυρη.\n"
@@ -5776,16 +5671,79 @@ msgstr ""
 "Αν έχετε ένα τέτοιο.\n"
 "Αν δεν είστε σίγουρος, απλά επιλέξτε OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 #, fuzzy
 msgid "Checking signature"
 msgstr "/Έλεγχος υπογραφής"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Δεν βρέθηκε υπογραφή"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Αποδεκτή υπογραφή από \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Αποδεκτή υπογραφή"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Υπογραφή δημιουργήθηκε %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, fuzzy, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Λάθος υπογραφή από \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "Λάθος υπογραφή"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Δεν υπάρχει δημόσιο κλειδί για να εξακριβώσω αυτή την υπογραφή"
+
 #: src/smtp.c:151
 #, fuzzy
 msgid "SMTP AUTH not available\n"
@@ -5998,265 +5956,265 @@ msgstr "Αρ."
 msgid "Creating summary view...\n"
 msgstr "Δημιουργία απεικόνισης περίληψης...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Μερικές σημάνσεις έχουν απομείνει. Να επεξεργαστούν;"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση καταλόγου (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 #, fuzzy
 msgid "Search again"
 msgstr "Η αναζήτηση απέτυχε"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 #, fuzzy
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 #, fuzzy
 msgid "No new messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα μηνύματα με ετικέτες"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν μηνύματα με ετικέτες."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " μήνυμα(τα) επιλέχθηκε(αν)"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Επιλέγω όλα τα μηνύματα..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr ""
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, fuzzy, c-format
 msgid "file %s already exists\n"
 msgstr "το %s υπάρχει ήδη"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Δημιουργώ απεικόνιση κειμένου...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Για να αποθηκεύσετε αυτό το τμήμα, επιλέξτε το μενού με "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "δεξί κουμπί και επιλέξτε `Αποθήκευση ως...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6264,11 +6222,11 @@ msgstr ""
 "ή πατήστε το πλήκτρο `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Για να εμφανίσετε αυτό το τμήμα ως μήνυμα κειμένου, επιλέξτε"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6276,35 +6234,35 @@ msgstr ""
 "`Εμφάνιση σαν κείμενο', ή πατήστε το πλήκτρο `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Για να ανοίξετε αυτό το τμήμα με εξωτερικό πρόγραμμα, επιλέξτε "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Άνοιγμα', ή `Άνοιγμα με...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ή κάντε διπλό κλικ, ή πατήστε το μεσαίο κουμπί, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ή πιέστε το πλήκτρο `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Αυτή η υπογραφή δεν έχει έλεγχθεί ακόμα.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Για να την ελέγξετε, επιλέξτε το μενού με\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "δεξί κουμπί και επιλέξτε `Έλεγχος υπογραφής'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6337,6 +6295,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "απέτυχε το γράψιμο στο %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Κλείσιμο"
+
+#~ msgid "Cancel"
+#~ msgstr "Ακύρωση"
+
+#~ msgid "No"
+#~ msgstr "Όχι"
+
+#~ msgid "Refresh"
+#~ msgstr "Ανανέωση"
+
+#~ msgid "Search"
+#~ msgstr "Αναζήτηση"
+
+#~ msgid "Apply"
+#~ msgstr "Εφαρμογή"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Ουπς. Η υπογραφή δεν εξακριβώθηκε"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Διαφορετικά αποτελέσματα για τις υπογραφές"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Σφάλμα: Άγνωστη κατάσταση"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "επίσης γνωστός ως \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Αποτύπωμα κλειδιού: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Βρέθηκε ταμπέλα: %s\n"
 
diff --git a/po/es.po b/po/es.po
index c9989257..fad047a9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-12-21 11:18+0100\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -64,22 +64,6 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Aceptar"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuración de cada cuenta...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nombre"
 
@@ -129,30 +113,30 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Añadir"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abajo"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Arriba"
@@ -161,13 +145,6 @@ msgstr "Arriba"
 msgid " Set as default account "
 msgstr " Establecer como cuenta por omisión "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Cerrar"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Borrar cuenta"
@@ -176,24 +153,15 @@ msgstr "Borrar cuenta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Esta seguro de que quiere borrar esta cuenta?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+No"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutanto: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizó: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Entrada/salida de acciones"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Enviar "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,11 +240,11 @@ msgstr ""
 "(`%%h' será sustituido por el parámetro)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Parámetro de usuario (oculto) de la acción"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "(`%%u' será sustituido con el parámetro)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Parámetro de usuario de la acción"
 
@@ -295,13 +263,13 @@ 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:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Notas"
 
@@ -309,24 +277,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Fichero"
@@ -347,8 +298,8 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -366,7 +317,7 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
@@ -398,7 +349,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -407,12 +358,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -429,7 +380,7 @@ msgstr "/Nuevo _grupo"
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -452,18 +403,18 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nombre:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Borrar"
 
@@ -492,18 +443,6 @@ msgstr "Borrar dirección(es)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "No"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -621,7 +560,7 @@ msgstr "Error en la conversión de la agenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -665,351 +604,351 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Error"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Creando el diálogo de alerta...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rojo"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al caracter anterior"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al caracter siguiente"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el caracter anterior"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el caracter siguiente"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Añadir a"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Encriptar con PGP"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1017,28 +956,28 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID-clave seleccionado actualmente `%"
 "s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1049,138 +988,138 @@ msgstr ""
 "de %s a %s.\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "no se pueden escribir las cabeceras\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1191,66 +1130,66 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de proceso id.: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichero temporal: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada desde proceso monitor\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "No se pudo ejecutar el editor externo\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "No se pudo escribir en el fichero\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Fallo leyendo tubería\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "a Borradores"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Reemplazar"
 
@@ -1258,77 +1197,76 @@ msgstr "Reemplazar"
 msgid "Edit address"
 msgstr "Editar dirección"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Añadir una persona nueva"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Editar detalles personales"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Debe especificarse una dirección de correo."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nombre y un Valor"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Apodo"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Dirección e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Arriba"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Abajo"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Datos básicos"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributos del usuario"
 
@@ -1344,7 +1282,7 @@ msgstr "No parece que el fichero esté en el formato de la agenda."
 msgid "Could not read file."
 msgstr "No se pudo leer del fichero."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Editar agenda"
 
@@ -1357,7 +1295,7 @@ msgstr " Comprobar fichero "
 msgid "File"
 msgstr "Fichero"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Añadir nueva agenda"
 
@@ -1389,32 +1327,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover las direcciones de correo desde/hacia el grupo con las flechas"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Editar detalles del grupo"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -1426,11 +1364,11 @@ msgstr "No parece que ese fichero esté en formato JPilot."
 msgid "Select JPilot File"
 msgstr "Seleccionar fichero JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1439,7 +1377,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Elemento(s) adicional(es) de la dirección"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Añadir nueva entrada JPilot"
 
@@ -1447,63 +1385,63 @@ msgstr "Añadir nueva entrada JPilot"
 msgid "Connected successfully to server"
 msgstr "Conectado con éxito al servidor"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "No se pudo conectar al servidor"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Puerto"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Comprobar servidor "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Base de búsqueda"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Criterio de búsqueda"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Limpiar "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Asociar DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Asociar contraseña"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Básico"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Añadir nuevo servidor LDAP"
 
@@ -1515,7 +1453,7 @@ msgstr "Editar LDAP - Seleccionar base de búsqueda"
 msgid "Available Search Base(s)"
 msgstr "Base(s) de búsqueda disponible(s)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "No se pudo leer la base de búsqueda del servidor - configúrela manualmente"
@@ -1528,11 +1466,11 @@ msgstr "No parece que el fichero esté en formato vCard."
 msgid "Select vCard File"
 msgstr "Seleccionar fichero vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Editar entrada vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Añadir nueva entrada vCard"
 
@@ -1561,10 +1499,10 @@ msgstr "Seleccionar..."
 msgid "Select exporting file"
 msgstr "Seleccione fichero de exportación"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración a fichero\n"
 
@@ -1572,41 +1510,41 @@ msgstr "fallo escribiendo la configuración a fichero\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta `%s' ya existe."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta `%s'."
@@ -1667,64 +1605,64 @@ msgstr "No leídos"
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Estableciendo información de carpeta...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucción del árbol de carpetas falló."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Reconstruyendo todos los árboles de carpetas..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en `%s'."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1734,16 +1672,16 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1752,24 +1690,24 @@ msgstr ""
 "Todas las carpetas y mensajes bajo `%s' serán borrados.\n"
 "¿Confirma el borrado?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1778,34 +1716,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón `%s' ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 `%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -1837,10 +1775,6 @@ msgstr "Mensajes"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Refrescar"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderado"
@@ -1853,15 +1787,15 @@ msgstr "solo lectura"
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Hecho."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
@@ -1878,11 +1812,11 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Sin remite)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -2115,7 +2049,7 @@ msgstr "Nombre de atributo"
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -2139,7 +2073,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2155,133 +2089,133 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2290,27 +2224,27 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Error de socket."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2319,11 +2253,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2332,15 +2266,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -2358,7 +2292,7 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2367,11 +2301,11 @@ msgstr ""
 "El fichero `%s' ya existe.\n"
 "No puedo crear la carpeta."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2379,16 +2313,16 @@ msgstr ""
 "GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2398,23 +2332,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2422,40 +2356,40 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed ejecutándose.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Configuración de acciones"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3088,56 +3022,56 @@ msgstr "/_Ayuda/_FAQ/_Italiano"
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separación de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "¿Vaciar los mensajes de todas las papeleras?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3147,16 +3081,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón `%s' ya existe."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3166,141 +3100,141 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Siguiente no leído"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
@@ -3402,10 +3336,6 @@ msgstr "Mayús./minús."
 msgid "Backward search"
 msgstr "Buscar hacia atrás"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Buscar"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Búsqueda fallida"
@@ -3430,28 +3360,28 @@ msgstr "Búsqueda concluida"
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Guardar como"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3460,7 +3390,7 @@ msgstr ""
 "Teclee la orden para imprimir:\n"
 "(`%s' será sustituido por el fichero)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3520,7 +3450,7 @@ msgstr "Creando visor de MIME...\n"
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Texto"
 
@@ -3532,15 +3462,15 @@ msgstr "Adjuntos"
 msgid "Select \"Check signature\" to check"
 msgstr "Seleccione \"Verificar firma\" para verificar"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "No se puede guardar la parte del mensaje multipartes."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3549,7 +3479,7 @@ msgstr ""
 "Teclee la orden para abrir el fichero:\n"
 "(`%s' será sustituido por el fichero)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La orden del visualizador MIME es inválida: `%s'"
@@ -3654,15 +3584,15 @@ msgstr "Hubo un error mientras se enviaba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Hubo un error enviando el mandato\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Frase contraseña"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3675,7 +3605,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3683,70 +3613,66 @@ msgstr ""
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No se encontro en el saludo la marca temporal APOP requerida\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "La marca temporal del saludo tiene un error de sintaxis\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Error del protocolo POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "respuesta UIDL no válida: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Borrando mensaje expirado %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaje %d (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "el buzón está bloqueado\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "tiempo de espera agotado para la sesión\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "no puedo abrir la sesión TLs\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "hubo algún error en la autentificación\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "mandato no soportado\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "hubo algún error en la sesión POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Encontrado %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Aplicar"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
@@ -3768,11 +3694,11 @@ msgstr "Preferencias de la cuenta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -3881,7 +3807,7 @@ msgstr "Descargar todos los mensajes del servidor"
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "Kb"
 
@@ -3901,7 +3827,7 @@ msgstr "(Los mensajes sin filtrar se guardarán en esta carpeta)"
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automática"
 
@@ -3909,7 +3835,7 @@ msgstr "Automática"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Cabecera"
 
@@ -3925,7 +3851,7 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4120,19 +4046,19 @@ msgstr ""
 "ASCII plano para mensajes encriptados. No cumple con el\n"
 "RFC 3156 - Seguridad MIME con OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Configuración de acciones"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nombre de menú:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Línea de orden:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4172,43 +4098,43 @@ msgstr ""
 "   %h para un argumento de usuario sin mostrar el texto.\n"
 "   %s para el texto seleccionado actualmente"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Reemplazar "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Ayuda sintaxis "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Acciones registradas"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nueva)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "No se estableció el nombre de menú."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No se permiten dos puntos ':' en el nombre de menú."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "El nombre del menú es demasiado largo."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "No se estableció la línea de orden."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "El nombre de menú y la orden son demasiado largos."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4219,91 +4145,91 @@ msgstr ""
 "%s\n"
 "tiene algún error de sintaxis."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Creando ventana de preferencias comunes...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferencias comunes"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citar"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Otras"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Programa externo"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Orden"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Almacenamiento local"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorporar del almacén"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrar al incorporar"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Ruta al almacén"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Comprobar correo nuevo"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Comprueba correo nuevo al inicio"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todos las carpetas locales después de incorporar"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4311,115 +4237,115 @@ msgstr ""
 "Número máximo de artículos a descargar\n"
 "(sin límite si se especifica 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Guardar mensajes enviados en Salida"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Conjunto de códigos para enviar"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4427,11 +4353,11 @@ msgstr ""
 "Si se selecciona `Automático' se utilizará la\n"
 "codificación óptima para la localización actual."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4439,115 +4365,115 @@ msgstr ""
 "Especificar la codificación de transferencia (Content-Transfer-Encoding)\n"
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Separador de firma"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Insertar automáticamente"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente la cuenta para responder"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citar el mensaje al responder"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Fuente"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con más de"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4555,63 +4481,63 @@ msgstr ""
 "Mostrar alfabéticos y numéricos multi-byte como\n"
 "caracteres ASCII (sólo para Japonés)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de firma"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Expirar después de"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4619,35 +4545,35 @@ msgstr ""
 "(Poniendo '0' mantendrá la contraseña\n"
 " durante toda la sesión)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contraseñas"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4655,216 +4581,216 @@ msgstr ""
 "(Los mensajes se marcarán hasta la ejecución\n"
 " si está desactivado)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay errores de recepción"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción al finalizar"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble click"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4888,11 +4814,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4906,7 +4832,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4918,15 +4844,15 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Selección de tipografía"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4936,31 +4862,31 @@ msgstr ""
 "Se pueden modificar también los atajos de los menús pulsando\n"
 "cualquier tecla(s) al situar el ratón sobre el elemento del menú."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Configuración de cabeceras de usuario"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Cabeceras de usuario"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Borrar cabecera"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
@@ -4968,143 +4894,143 @@ msgstr "¿Quiere borrar realmente esta cabecera?"
 msgid "Creating display header setting window...\n"
 msgstr "Creando ventana de visualización de propiedades de cabeceras...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Ver propiedades de cabeceras"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Cabecera"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Cabeceras mostradas"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Cabeceras ocultas"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas las cabeceras"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Leyendo configuración para mostrar cabeceras...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Escribiendo configuración para mostrar cabeceras...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Encima"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Debajo"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "¿Está seguro de que quiere borrar esta regla?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Regla de filtrado"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Si coincide alguna de las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Si coinciden todas las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Realizar las acciones siguientes:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "Para o Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Cualquier cabecera"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Editar cabecera..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Cuerpo del mensaje"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Resultado de una orden"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "es"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "no es"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "no coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "es mayor que"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "es menor que"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "es más largo que"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "es más corto que"
 
@@ -5152,23 +5078,23 @@ msgstr "Ejecutar orden"
 msgid "Stop rule evaluation"
 msgstr "Detener la evaluación de reglas"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "carpeta:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "dirección:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Editar lista de cabeceras"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Cabeceras"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Cabecera:"
 
@@ -5333,7 +5259,7 @@ msgstr "Borrar plantilla"
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
@@ -5356,11 +5282,11 @@ msgstr "Fallo enviando mensaje %d de la cola.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden de impresión es inválida: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Estado"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Creando diálogo de progreso...\n"
 
@@ -5372,97 +5298,66 @@ msgstr "hubo un error mientras se obtenian datos.\n"
 msgid "Can't write to file.\n"
 msgstr "No se puede escribir al fichero.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: firma no verificada"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "No se encontró firma"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Firma válida"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "Firma INVÁLIDA"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "No hay clave pública para verificar la firma"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Error al verificar la firma"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Resultados diferentes para las firmas"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Error: Estado desconocido"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Firma válida de \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Firma INVÁLIDA de \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "No encuentro ID de usuario para esta clave."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Firma hecha en %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Huella de clave: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Error al verificar la firma"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Seleccione clave para `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Recogiendo info para `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Seleccione teclas"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID tecla"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Añadir clave"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Teclee otro usuario o ID-clave:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Cabecera corrupta en el mensaje en cola.\n"
@@ -5550,15 +5445,78 @@ msgstr ""
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Verificando firma"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s desde \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "No se encontró firma"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Firma válida de \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Firma válida"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Firma hecha en %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Firma INVÁLIDA de \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "Firma INVÁLIDA"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "No hay clave pública para verificar la firma"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH no está disponible\n"
@@ -5761,255 +5719,255 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Búscar de nuevo"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 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:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Seleccionando todos los mensajes..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Deshaciendo hilos para ejecución..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "el fichero %s ya existe\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Para guardar esta parte, abra el menu contextual con el "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "botón derecho y seleccione `Guardar como...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6017,11 +5975,11 @@ msgstr ""
 "o pulse la tecla `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Para ver esta parte como un mensaje de texto, seleccione "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6029,35 +5987,35 @@ msgstr ""
 "`Ver como texto', o pulse la tecla `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Para abrir esta parte con un programa externo seleccione "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Abrir' o `Abrir con...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "o doble-click, o pulse el botón central, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "o pulse la tecla `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Esta firma aún no ha sido verificada.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Para verificarla, abra el menu contextual con\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "el botón derecho y seleccione `Verificar firma'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6093,6 +6051,42 @@ msgstr "%.2fGb"
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Refresh"
+#~ msgstr "Refrescar"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: firma no verificada"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Resultados diferentes para las firmas"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Error: Estado desconocido"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Huella de clave: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Encontrada etiqueta: %s\n"
 
diff --git a/po/et.po b/po/et.po
index 1aadc8aa..ada6cafa 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -62,22 +62,6 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OLGU"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Loen kõigi kontode seaded...\n"
@@ -111,11 +95,11 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nimi"
 
@@ -127,30 +111,30 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Lisa"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Redigeeri"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Kustuta "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Alla"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Üles"
@@ -159,13 +143,6 @@ msgstr "Üles"
 msgid " Set as default account "
 msgstr " Määra vaikimisi kontoks "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Sulge"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Kustuta konto"
@@ -174,24 +151,15 @@ msgstr "Kustuta konto"
 msgid "Do you really want to delete this account?"
 msgstr "Kas te tõesti soovite kustutada kontot?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Jah"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Ei"
 
@@ -237,29 +205,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Käivitan: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Lõpetatud: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Tegevuse sisend/väljund"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Saada "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Katkesta"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -269,11 +237,11 @@ msgstr ""
 "Sisesta trükkimise käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -283,7 +251,7 @@ msgstr ""
 "Sisesta trükkimise käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -291,13 +259,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Märkused"
 
@@ -305,24 +273,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Loobu"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Fail"
@@ -343,8 +294,8 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -362,7 +313,7 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
@@ -394,7 +345,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -403,12 +354,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -425,7 +376,7 @@ msgstr "/Uus _Grupp"
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -435,7 +386,7 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/R_edaktor"
@@ -448,18 +399,18 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nimi:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -488,18 +439,6 @@ msgstr "Kustuta aadress(id)"
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ei"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -616,7 +555,7 @@ msgstr "Aadressiraamatu uuendamise viga"
 msgid "Addressbook Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Kasutajaliides"
 
@@ -660,360 +599,360 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Viga"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "*Loon alert paneeli dialoogi...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Näita seda teadet järgmisel korral"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Oranž"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Punane"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Roosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Taevasinine"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Sinine"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Roheline"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Pruun"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/R_edigeeri/_Edendatud"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redaktor/_Edendatud/Liigu tähe jagu tagasi"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redaktor/_Edendatud/Liigu tähe jagu edasi"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redaktor/_Edendatud/Liigu sõna jagu tagasi"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redaktor/_Edendatud/Liigu sõna jagu edasi"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redaktor/_Edendatud/Liigu rea algusesse"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redaktor/_Edendatud/Liigu rea lõppu"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redaktor/_Edendatud/Liigu eelmisele reale"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redaktor/_Edendatud/Liigu järgmisele reale"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redaktor/_Edendatud/Kustuta eelmine täht"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redaktor/_Edendatud/Kustuta järgmine täht"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redaktor/_Edendatud/Kustuta eelmine sõna"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redaktor/_Edendatud/Kustuta järgmine sõna"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redaktor/_Edendatud/Kustuta rida"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redaktor/_Edendatud/Kustuta rea lõpp"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Redigeeritud]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Kirjuta kiri%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1021,27 +960,27 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ei suutnud leida ühtki võtit, mis oleks seotud valitud võtmega (id'%s')."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1051,139 +990,139 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "Ei suuda kirjutada päist\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME tüüp"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Manusta fail"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1194,66 +1133,66 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Hävitatud protsessi grupi id: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ajutine fail: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Ei suutnud välist redaktorit käivitada\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Ei suutnud faili salvestada\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Torust lugemine ebaõnnestus\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Kaota kiri"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Kaota"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "Mustanditesse"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Asenda"
 
@@ -1261,77 +1200,76 @@ msgstr "Asenda"
 msgid "Edit address"
 msgstr "Redigeeri aadressi"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Lisa uus persoon"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Muuda persooni detaile"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "E-Posti aadress tuleb lisada."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Nimi ja Väärtus tulevad lisada."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Muuda persooni andmeid"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Ekraani nimi"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Eesnii"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Hüüdnimi"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-Posti aadress"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Liiguta ülesse"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Liiguta alla"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Muuda"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Kustuta"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Väärtus"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Baasandmed"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Kasutaja atribuudid"
 
@@ -1347,7 +1285,7 @@ msgstr "Failid ei paista olevat õiges aadressiraamatu formaadis."
 msgid "Could not read file."
 msgstr "Ei suutnud lugeda faili."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Redigeeri aadressiraamatut"
 
@@ -1360,7 +1298,7 @@ msgstr " Kontrolli faili "
 msgid "File"
 msgstr "Fail"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Lisa uus aadressiraamat"
 
@@ -1392,32 +1330,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Olemasolevad aadressid"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Nihuta E-Posti aadressid gruppi või grupist kasutades nooleklahve"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Muuda grupi detaile"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Lisa uus grupp"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Redigeeri kausta"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -1429,11 +1367,11 @@ msgstr "Fail ei paista olevat jPilot formaadis."
 msgid "Select JPilot File"
 msgstr "Vali JPilot Fail"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1442,7 +1380,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Lisanduv E-Posti aadressi sissekanded"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Lisa uus JPilot'i sissekanne"
 
@@ -1450,63 +1388,63 @@ msgstr "Lisa uus JPilot'i sissekanne"
 msgid "Connected successfully to server"
 msgstr "Edukalt ühendatud serveriga"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ei suutnud saada serveriga ühendust"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Redigeeri LDAP serverit"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Arvuti nimi"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Kontrolli Serverit "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Otsingu baas"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Otsingu riteerium"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Resett "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Seo DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Seo parool"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Ajalimiit (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Baas"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Laiendatud"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Lisa uus LDAP server"
 
@@ -1518,7 +1456,7 @@ msgstr "Redigeeri LDAP - Vali otsingu baas"
 msgid "Available Search Base(s)"
 msgstr "Võimalikud otsingu baasid"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Ei suutnud lugeda otsingu baase serverist - palu määra käsitsi"
 
@@ -1530,11 +1468,11 @@ msgstr "Fail ei paista olevat vCard formaadis"
 msgid "Select vCard File"
 msgstr "Vali vCard Fail"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Redigeeri vCard sissekannet"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Lisa uus vCard sissekanne"
 
@@ -1563,10 +1501,10 @@ msgstr " Vali... "
 msgid "Select exporting file"
 msgstr "Vali väljastatav fail"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
 
@@ -1574,41 +1512,41 @@ msgstr "Häälestuse salvestamine ebaõnnestus\n"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -1672,68 +1610,68 @@ msgstr "Pole loetud"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 #, fuzzy
 msgid "Rebuilding all folder trees..."
 msgstr "Uuendan kõigi kaustade puud..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1743,16 +1681,16 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1761,24 +1699,24 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1787,34 +1725,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -1846,10 +1784,6 @@ msgstr "Kirjad"
 msgid "Type"
 msgstr "Tüüp"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Uuenda"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "mõõdukas"
@@ -1862,15 +1796,15 @@ msgstr "ainult loetav"
 msgid "unknown"
 msgstr "tundmatu"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Tehtud."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "saadi %d uudistegruppi (%s loetud)"
@@ -1887,11 +1821,11 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -2129,7 +2063,7 @@ msgstr "Atribuudi nimi"
 msgid "Attribute"
 msgstr "Atribuudid"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Vali"
 
@@ -2153,7 +2087,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Järgmine"
 
@@ -2169,191 +2103,191 @@ msgstr "Atribuudid"
 msgid "Finish"
 msgstr "Soome"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -2371,7 +2305,7 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2380,11 +2314,11 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ei ole glib poolt toetatud.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2392,16 +2326,16 @@ msgstr ""
 "GnuPG pole installeeritud, või on liialt vana.\n"
 "OpenPGP toetus keelustatud."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2411,64 +2345,64 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3119,58 +3053,58 @@ msgstr "/_Abi/_KKK/_Itaalia"
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise tüüpi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3179,16 +3113,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3197,144 +3131,144 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Võta"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Võta uued kirjad"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Võta kõik"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Võta kõigilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Järgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
@@ -3436,10 +3370,6 @@ msgstr "Tõstutundlik"
 msgid "Backward search"
 msgstr "Otsi tagurpidi"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Otsi"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Otsimine ebaõnnestus"
@@ -3464,28 +3394,28 @@ msgstr "Otsimine lõpetatud"
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Salvesta kui"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Kirjutame olemasoleva faili üle?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3494,7 +3424,7 @@ msgstr ""
 "Sisesta trükkimise käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3554,7 +3484,7 @@ msgstr "Loon MIME vaate...\n"
 msgid "MIME Type"
 msgstr "MIME Tüüp"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3566,15 +3496,15 @@ msgstr "Manused"
 msgid "Select \"Check signature\" to check"
 msgstr "Selekteeri \"Kontrolli signatuuri\" kontrollimiseks"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Ei saa salvestada seda osa mitmeosalisest kirjast."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Ava kasutades"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3583,7 +3513,7 @@ msgstr ""
 "Faili avamiseks sisesta käsurida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME vaataja käsurida pole õige: %s"
@@ -3689,15 +3619,15 @@ msgstr "Kirja saatmisel tekkis viga\n"
 msgid "Error occurred while sending command\n"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Paroolifraas"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[pole kasutaja id-t]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3710,7 +3640,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3718,72 +3648,68 @@ msgstr ""
 "Vale parool! Proovi uuesti...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nõutud APOP'i ajatemplit ei leidunud tervituses\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "*Tervituses on ajamärgi süntaksi viga\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokolli viga\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "*vigane xover rida: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Kustutan aegunud kirja %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Jätan kirja (%d / %d baiti) vahele\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "kirjakast on lukus\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "ei suutnud käivitada TLS sessiooni\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Käsklus"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Leiti %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Rakenda"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
@@ -3805,11 +3731,11 @@ msgstr "Konto omadused"
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privaatsus"
 
@@ -3919,7 +3845,7 @@ msgstr "Võta serverist kõik kirjad"
 msgid "Receive size limit"
 msgstr "Tõmbamise suuruse limiit"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3939,7 +3865,7 @@ msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -3947,7 +3873,7 @@ msgstr "Automaatne"
 msgid "`Get all' checks for new messages on this account"
 msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Päis"
 
@@ -3963,7 +3889,7 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4159,20 +4085,20 @@ msgstr ""
 "krüpteerimise reziimi. See ei sobi RFC 3516 - MIME \n"
 "turvalisusega kasutades OpenPGP-d."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menüü nimi:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Käsurida:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4208,44 +4134,44 @@ msgstr ""
 "   %F nimistu märgitud kirja failinimedele\n"
 "   %p märgitud kirjaosa."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Asenda"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Süntaksi abi "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registreeritud tegevused"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Uus)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menüü nime ei ole sisestatud."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Koolonit ':' ei ole lubatud kasutada menüü nimes."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menüü nimi on liialt pikk."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menüü nimi ja käsklus on liialt pikad."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4256,91 +4182,91 @@ msgstr ""
 "%s\n"
 "on süntaksiviga."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Kustuta tegevus"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Kas te tõesti soovite kustutada seda tegevust?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Loon üldiste omaduste akent...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Üldised omadused"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Tsitaat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Ekraan"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Kiri"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Muud asjad"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Väline programm"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Kasuta välist programmi kirjade võtmiseks"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Käsklus"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokaalne kirja jada"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Võta kirjad lokaalsest kirja jadast"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtreeri kirju nende võtmisel"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Võta kirju"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "iga"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuti järel"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Võta uued kirjad töö alguses"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4348,115 +4274,115 @@ msgstr ""
 "Maksimaalne võetavate artiklite arv\n"
 "(määramata kui sisestate 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Pane saadetud kirjad kausta Saadetud"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automaatne (Soovitatav)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitine ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unikood (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Lääne-Euroopa (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Kesk Euroopa (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4464,189 +4390,189 @@ msgstr ""
 "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Allkirja eraldaja"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Lisa automaatselt"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Käivita väline redaktor automaatselt"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Meelespeetavaid muudatusi"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Äärista kirjaread"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "sümboli laiuseks"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Äärista tsitaati"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Murra kõik pikad read sisestamisel"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Äärista enne saatmist"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Vali vastuste jaoks konto automaatselt"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Kirjale vastamisel tsiteeri seda."
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Vasta nupp käivitab vastamise kirjalisti"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Vastuse formaat"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Tsitaadi märk"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Edasta formaat"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Sümbolite seletus "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Tekstistiil"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Tõlgi päise nimed (näiteks From: Subject: ...)"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "lühenda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "tähte"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Määra kirjaloendis näidatavad elemendid... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Kirja värvimine lubatud"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Näita kirja päist ülalpool kirja vaadet"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Säilita parooli ajutiselt mälus"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Aegub pärast"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4654,36 +4580,36 @@ msgstr ""
 "(Kui seada '0'-ks, siis parool salvesatakse\n"
 "kogu sessiooniks)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4691,217 +4617,217 @@ msgstr ""
 "(Kirjad lihtsalt märgitakse enne täitmit\n"
 " kui see on välja lülitatud)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Programmist väljumisel"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Kontrolli väljumist"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Tühjenda prügikast"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Küsi enne tühjendamist"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui järjekorras on kirju"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4925,11 +4851,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4943,7 +4869,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4955,15 +4881,15 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Fondi valik"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4973,31 +4899,31 @@ msgstr ""
 "Te võite ka modifitseerida iga menüü kiirklahve vajutades\n"
 "suvalistele klahvidele asetades samal ajal hiire sellele."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Enda määratud päise häälestus"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Enda määratud päis"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Päise nimi ei ole sisestatud."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Kustuta päis"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Kas te tõesti tahate seda päist kustutada?"
 
@@ -5005,150 +4931,150 @@ msgstr "Kas te tõesti tahate seda päist kustutada?"
 msgid "Creating display header setting window...\n"
 msgstr "Loon päise näitamise häälestuse dialoogi...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Päise näitamine"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Päise nimi"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Näidatud päised"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Varjatud päised"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Näita kõiki märkimata päiseid"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Loen päise näitamise häälestust...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Kirjutan päise näitamise häälestuse...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "See päis juba on nimekirjas."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filtri sättimine"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Kellele:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/Kopeeri..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Kas te tõesti soovite seda reeglit kustutada?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Kogu päis"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Kiri"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "sisaldab"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ei sisalda"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5205,27 +5131,27 @@ msgstr "Käivita"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Kaust"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Aadress"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Päis"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Päis"
@@ -5398,7 +5324,7 @@ msgstr "Kustuta mall"
 msgid "Do you really want to delete this template?"
 msgstr "Kas te tõesti tahate seda vormi kustutada?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 
@@ -5421,11 +5347,11 @@ msgstr "Järjekorda seatud kirja %d saatmine ebaõnnestus.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Staatus"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Loon progressi dialoogi...\n"
 
@@ -5437,97 +5363,66 @@ msgstr "tekkis viga andmete võtmisel.\n"
 msgid "Can't write to file.\n"
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Allkirja pole kontrollitud"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Allkirja ei leidunud"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Hea allkiri"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "HALB allkiri"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Pole avalikku võtit allkirja kontrollimiseks"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Viga allkirja kontrollimisel"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Allkirja jaoks saadi erinevaid tulemeid."
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Viga: Tundmatu staatus"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "\"%s\"-lt on hea allkiri"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Halb allkiri \"%s\"-lt"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Ei suuda leida selle võtme jaoks kasutaja ID-d."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                 aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Allkiri %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Võtme sõrmejälg: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Viga allkirja kontrollimisel"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Palun valige võti %s-i jaoks"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Kogun nfot %s...%c-i jaoks"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Vali võtmed"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Võtme ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Lisa võti"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Sisesta teine kasutaja või võtme ID:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Järjekorda seatud kirja päis on katki.\n"
@@ -5617,15 +5512,78 @@ msgstr ""
 "siis te võite seda kasutada.\n"
 "Kui te pole aga kindel, sellisel juhul valige lihtsalt OLGU."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Allkirja kontroll"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s \"%s\"-lt"
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Allkirja ei leidunud"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "\"%s\"-lt on hea allkiri"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Hea allkiri"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Allkiri %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Halb allkiri \"%s\"-lt"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "HALB allkiri"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Pole avalikku võtit allkirja kontrollimiseks"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH pole saadav\n"
@@ -5830,258 +5788,258 @@ msgstr "Ei."
 msgid "Creating summary view...\n"
 msgstr "Loon kokkuvõtte vaate...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Protsessi märk"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Mõned märgid on jäänud. Protsessime selle?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Märgin kõik kirjad..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "*Käivitamiseks ilma teemadeta..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "fail %s on juba olemas\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Loon tekstivaate...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Et seda osa salvestada, ava kontekstimenüü tehes "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "paremklõpsu ja valides 'Salvesta kui...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6089,11 +6047,11 @@ msgstr ""
 "või vajuta 'y' klahvi.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Et näidata seda osa kui tekstiteadet, vali "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6101,35 +6059,35 @@ msgstr ""
 "'Näita kui tekst', või vajuta 't' klahvi.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Et avada seda osa välise programmiga, vali "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "'Ava' või 'Ava kasutades...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "või topeltklõps, või kliki keskmist klahvi, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "või vajuta 'l' klahvi."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Seda allkirja pole veel kontrollitud.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Et seda kontrollida, ava kontekstimenüü tehes\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "paremklõps ja vali `kontrolli signatuur'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6162,6 +6120,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
 
+#~ msgid "OK"
+#~ msgstr "OLGU"
+
+#~ msgid "Close"
+#~ msgstr "Sulge"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
+#~ msgid "No"
+#~ msgstr "Ei"
+
+#~ msgid "Refresh"
+#~ msgstr "Uuenda"
+
+#~ msgid "Search"
+#~ msgstr "Otsi"
+
+#~ msgid "Apply"
+#~ msgstr "Rakenda"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Allkirja pole kontrollitud"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Allkirja jaoks saadi erinevaid tulemeid."
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Viga: Tundmatu staatus"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                 aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Võtme sõrmejälg: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Silt %s on leitud\n"
 
diff --git a/po/fr.po b/po/fr.po
index b64506e5..13349f1c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-12-09 20:16+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -70,22 +70,6 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
@@ -121,11 +105,11 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nom"
 
@@ -137,30 +121,30 @@ msgstr "Protocole"
 msgid "Server"
 msgstr "Serveur"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Supprimer "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Plus haut"
@@ -169,13 +153,6 @@ msgstr "Plus haut"
 msgid " Set as default account "
 msgstr " Définir comme compte par défaut "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Fermer"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Supprimer le compte"
@@ -184,24 +161,15 @@ msgstr "Supprimer le compte"
 msgid "Do you really want to delete this account?"
 msgstr "Voulez-vous vraiment supprimer ce compte ?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Oui"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Non"
 
@@ -247,29 +215,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- En cours : %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminé : %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Entrées et sorties des actions"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "Envoyer"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Stopper"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -280,11 +248,11 @@ msgstr ""
 "(« %%h » sera remplacé par l'argument saisi)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Argument invisible de l'action"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -295,7 +263,7 @@ msgstr ""
 "(« %%u » sera remplacé par l'argument saisi)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Argument de l'action"
 
@@ -303,13 +271,13 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -317,24 +285,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Fichier"
@@ -355,8 +306,8 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -374,7 +325,7 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
@@ -406,7 +357,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -415,12 +366,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -437,7 +388,7 @@ msgstr "/Nouveau _groupe"
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -447,7 +398,7 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/É_dition"
@@ -460,18 +411,18 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nom :"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -500,18 +451,6 @@ msgstr "Suppression d'adresse(s)"
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Non"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -632,7 +571,7 @@ msgstr "Erreur de conversion du carnet d'adresses"
 msgid "Addressbook Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interface"
 
@@ -676,353 +615,353 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Erreur"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Création du dialogue d'alerte...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Afficher ce message la prochaine fois"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rouge"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rose"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Bleu ciel"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Vert"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Brun"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/É_dition/A_vancée"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/É_dition/A_vancée/Reculer d'un caractère"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/É_dition/A_vancée/Avancer d'un caractère"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/É_dition/A_vancée/Reculer d'un mot"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/É_dition/A_vancée/Avancer d'un mot"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/É_dition/A_vancée/Aller en début de ligne"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/É_dition/A_vancée/Aller en fin de ligne"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/É_dition/A_vancée/Aller à la ligne précédente"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/É_dition/A_vancée/Aller à la ligne suivante"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/É_dition/A_vancée/Supprimer le caractère précédent"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/É_dition/A_vancée/Supprimer le caractère suivant"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/É_dition/A_vancée/Supprimer le mot précédent"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/É_dition/A_vancée/Supprimer le mot suivant"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/É_dition/A_vancée/Effacer la ligne"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/É_dition/A_vancée/Supprimer jusqu'à la fin de la ligne"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Affichage/_Faire suivre à"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une réponse ou d'un "
 "transfert."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [modifié]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Composition d'un message%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1030,26 +969,26 @@ msgstr ""
 "Aucun compte n'a été spécifié pour l'envoi.\n"
 "Veuillez sélectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Impossible d'enregistrer de message dans la boîte de messages envoyés"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Impossible de trouver une touche associée au code (de touche) « %s »."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1059,138 +998,138 @@ msgstr ""
 "Impossible de convertir le jeu de caractères du message\n"
 "de %s vers %s. Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "impossible d'écrire les en-têtes\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Type MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Insérer la signature"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Éditeur de texte"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1201,68 +1140,68 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Id de traitement de groupe terminé : %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichier temporaire : %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose : entrée à partir d'une surveillance de traitement\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Impossible de lancer l'éditeur externe\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Impossible d'écrire dans le fichier\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Échec de lecture de pipe\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr ""
 "Ce message a été modifié mais pas envoyé. Voulez-vous interrompre la "
 "composition ?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Interrompre"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "vers brouillon"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Remplacer"
 
@@ -1270,77 +1209,76 @@ msgstr "Remplacer"
 msgid "Edit address"
 msgstr "Édition d'une adresse"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Ajouter une personne"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "L'adresse électronique est obligatoire."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Un nom et une valeur doivent être donnés."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Surnom"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Plus haut"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Plus bas"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valeur"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Général"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Données supplémentaires"
 
@@ -1356,7 +1294,7 @@ msgstr "Le fichier ne semble pas avoir le format du carnet d'adresses."
 msgid "Could not read file."
 msgstr "Impossible de lire le fichier."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Édition du carnet d'adresses"
 
@@ -1369,7 +1307,7 @@ msgstr " Vérifier le fichier "
 msgid "File"
 msgstr "Fichier"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Nouveau carnet d'adresses"
 
@@ -1401,33 +1339,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Adresses disponibles"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Déplacer les adresses souhaitées du/vers le groupe avec les boutons fléchés"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Nouveau groupe"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -1439,11 +1377,11 @@ msgstr "Le fichier ne semble pas avoir le format JPilot."
 msgid "Select JPilot File"
 msgstr "Choisir le fichier à importer"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1452,7 +1390,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Adresses électroniques supplémentaires"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Ajouter une donnée JPilot"
 
@@ -1460,63 +1398,63 @@ msgstr "Ajouter une donnée JPilot"
 msgid "Connected successfully to server"
 msgstr "Connexion réussie vers le serveur"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Impossible de se connecter au serveur"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Édition du serveur LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hôte"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Test serveur "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Base de recherche"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Critères de recherche"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Remise à zéro "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "DN de connexion"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Mot de passe de connexion"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Délai d'attente (secs)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Général"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Avancé"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Nouveau serveur LDAP"
 
@@ -1528,7 +1466,7 @@ msgstr "LDAP - Sélection de bases de recherches"
 msgid "Available Search Base(s)"
 msgstr "Base(s) disponible(s)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Impossible d'obtenir les bases du serveur - définir manuellement"
 
@@ -1540,11 +1478,11 @@ msgstr "Le fichier ne semble pas avoir le format vCard."
 msgid "Select vCard File"
 msgstr "Sélection d'un fichier vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Édition d'une entrée vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Ajouter une entrée vCard"
 
@@ -1574,10 +1512,10 @@ msgstr " Choisir... "
 msgid "Select exporting file"
 msgstr "Sélection du fichier exporté"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
 
@@ -1585,41 +1523,41 @@ msgstr "Échec d'écriture de la configuration dans le fichier\n"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -1680,65 +1618,65 @@ msgstr "Non lu"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Reconstruction de l'arborescence complète..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1748,16 +1686,16 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1766,24 +1704,24 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être supprimés.\n"
 "Voulez-vous vraiment les supprimer ?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1792,34 +1730,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -1851,10 +1789,6 @@ msgstr "Messages"
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Rafraîchir"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "modéré"
@@ -1867,15 +1801,15 @@ msgstr "lecture uniquement"
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Terminé."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
@@ -1892,11 +1826,11 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -2131,7 +2065,7 @@ msgstr "Attribut"
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -2155,7 +2089,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Suivant"
 
@@ -2171,133 +2105,133 @@ msgstr "Attributs"
 msgid "Finish"
 msgstr "Terminé"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Terminé - %d message(s) %s reçu(s)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages"
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2306,27 +2240,27 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2335,11 +2269,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2348,15 +2282,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -2374,7 +2308,7 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2383,11 +2317,11 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non supporté par glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2395,16 +2329,16 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2415,24 +2349,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2440,44 +2374,44 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Actions"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3113,56 +3047,56 @@ msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de séparation de fenêtre de %d vers %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "Supprimer tous les messages dans les corbeilles ?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3171,16 +3105,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3190,141 +3124,141 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Répondre"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Répondre au message"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "À tous"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Transférer"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Transférer le message"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Vous êtes déconnecté. Cliquer sur l'icône pour vous connecter."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Vous êtes connecté. Cliquer sur l'icône pour vous déconnecter."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3426,10 +3360,6 @@ msgstr "Respecter la casse"
 msgid "Backward search"
 msgstr "Recherche arrière"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Rechercher"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "La recherche a échoué"
@@ -3454,28 +3384,28 @@ msgstr "Recherche terminée"
 msgid "Creating message view...\n"
 msgstr "Création de la vue message...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Remplacer"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Remplacer le fichier existant ?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3484,7 +3414,7 @@ msgstr ""
 "Saisissez la ligne commande pour imprimer :\n"
 "(« %s » sera remplacé par le nom du fichier)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3544,7 +3474,7 @@ msgstr "Création de la vue MIME...\n"
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Texte"
 
@@ -3556,15 +3486,15 @@ msgstr "Pièces jointes"
 msgid "Select \"Check signature\" to check"
 msgstr "Sélectionner « Vérifier la  signature » pour vérifier"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Impossible d'enregistrer une pièce d'un message multipart"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Ouvrir avec"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3573,7 +3503,7 @@ msgstr ""
 "Saisissez la ligne de commande pour ouvrir le fichier :\n"
 "(« %s » sera remplacé par le nom du fichier)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
@@ -3678,15 +3608,15 @@ 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"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Phrase secrète"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[pas d'ID utilisateur]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3699,7 +3629,7 @@ msgstr ""
 " %.*s \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3707,72 +3637,68 @@ msgstr ""
 "Phrase secrète incorrecte. Autre tentative...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Le 'timestamp' APOP n'a pas été reçu\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe du 'timestamp' dans la bannière\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Erreur de protocole POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "réponse UIDL invalide : %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Suppression du message expiré %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Message ignoré %d (%d octets)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "La boîte aux lettres est verrouillée\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "dépassement du délai de réponse (timeout) de la session\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "échec lors de l'ouverture de la session TLS\n"
 
 #
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Erreur lors de l'authorisation\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "commande non supportée\n"
 
 #
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "Une erreur est survenue pendant la session POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Trouvé : %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Appliquer"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fenêtre de configuration du compte...\n"
@@ -3794,11 +3720,11 @@ msgstr "Configuration du compte"
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -3907,7 +3833,7 @@ msgstr "Réception de tous les messages sur le serveur"
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "Ko"
 
@@ -3927,7 +3853,7 @@ msgstr "(Les messages non filtrés seront placés dans ce dossier)"
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -3935,7 +3861,7 @@ msgstr "Automatique"
 msgid "`Get all' checks for new messages on this account"
 msgstr "« Tout relever » relève le courrier pour ce compte"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "En-tête"
 
@@ -3951,7 +3877,7 @@ msgstr "Génération d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4146,19 +4072,19 @@ msgstr ""
 "pour les messages chiffrés. Il n'est pas conforme avec\n"
 "la RFC 3156, intitulée « MIME Security with OpenPGP »."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Actions"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nom du menu :"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Commande :"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4200,43 +4126,43 @@ msgstr ""
 "   « %h » pour obtenir la saisie invisible d'un argument\n"
 "   « %s » pour utiliser la partie sélectionnée du message"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Remplacer "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Aide "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nouveau)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Le nom du menu n'a pas été défini."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Les deux-points « : » ne sont pas acceptés dans le nom du menu."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Le nom du menu est trop long."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "La commande n'a pas été définie."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Le nom et la commande sont trop longs."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4246,91 +4172,91 @@ msgstr ""
 "Erreur de syntaxe dans la commande :\n"
 "%s"
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Supprimer l'action"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Voulez-vous vraiment supprimer cette action ?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Création de la fenêtre des préférences générales...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Préférences générales"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citation"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Affichage"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Message"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Autres"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Programme externe"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Utiliser un programme externe pour l'incorporation"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Commande"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Spool local"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorporation à partir du spool"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrage à l'incorporation"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Chemin du spool"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Relève automatique du courrier"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "chaque"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Relever le courrier au démarrage"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Mettre à jour tous les dossiers locaux après incorporation"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4338,115 +4264,115 @@ msgstr ""
 "Nombre maximum d'articles à récupérer\n"
 "(pas de limite si 0 est spécifié)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Utiliser un programme externe pour l'envoi"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Enregistrer les messages envoyés dans la boîte d'envoi"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Jeu de caractères pour l'envoi"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe occidentale (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltique (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Europe du Nord (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4454,11 +4380,11 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères optimal pour le\n"
 "language utilisé sera choisi automatiquement."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Algo. de transmission"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4466,117 +4392,117 @@ msgstr ""
 "Précise le champ « Content-Transfer-Encoding » utilisé quand\n"
 "le corps du message contient des caractères non ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Séparateur de signature"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Insérer automatiquement"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'éditeur externe"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Justifier les messages à"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caractères"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Justifier la citation"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Justification automatique"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Justifier avant d'envoyer"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Sélection automatique du compte lors d'une réponse"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citer le message en répondant"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton répondre agit pour la liste de diffusion"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Citation lors d'une réponse"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Caractère de citation"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Citation lors d'un transfert"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Description des symboles "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Police"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduire le nom des en-têtes « From: », « Subject: », etc."
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Afficher le nombre de messages non lus près du nom de dossier"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "lettres"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Résumé des messages"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
 "l'expéditeur du message"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Éléments affichés dans le résumé... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4584,63 +4510,63 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caractères ASCII (Japonais seulement)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au dessus du message"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Adapter les images aux dimensions de la fenêtre des messages"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Afficher le résultat de la vérification dans une fenêtre"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Mémoriser temporairement la phrase secrète"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Expiration après"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4648,251 +4574,251 @@ msgstr ""
 "(Mettre 0 pour mémoriser la phrase secrète\n"
 " pendant toute la durée de la session)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
 msgstr "(sinon, les messages resteront marqués jusqu'à exécution)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Message de réception"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception :"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr " toujours"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une relève manuelle du courrier"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr " jamais"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception à la fin"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplacé par le nom du fichier/URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4916,11 +4842,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4934,7 +4860,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4946,15 +4872,15 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Sélection de la police"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4966,31 +4892,31 @@ msgstr ""
 "en le pointant avec la souris et en pressant une\n"
 "combinaison de touches."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Édition des en-têtes supplémentaires"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "En-tête supplémentaires"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Le nom de l'en-tête n'est pas défini."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Supprimer l'en-tête"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Voulez-vous vraiment détruire cet en-tête ?"
 
@@ -4998,143 +4924,143 @@ msgstr "Voulez-vous vraiment détruire cet en-tête ?"
 msgid "Creating display header setting window...\n"
 msgstr "Création de la fenêtre configuration en-têtes supplémentaires...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Options d'affichage des en-têtes"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "En-tête"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "En-têtes affichés"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "En-têtes cachés"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Afficher tous les en-têtes non spécifiés"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Lecture de la configuration de l'affichage des en-têtes...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Ecriture de la configuration de l'affichage des en-têtes...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Cet en-tête est déjà dans la liste."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Règles de filtrage"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Activé"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "En haut"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "En bas"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Copier"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Supprimer une règle"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Voulez-vous vraiment supprimer cette règle ?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Règle de filtrage"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Effectuer les actions suivantes :"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "To ou Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Tout en-tête"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Éditer l'en-tête..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Corps du message"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Résultat de la commande"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "contient"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "est"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "n'est pas"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "vérifie l'expression régulière"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "ne vérifie pas l'expression régulière"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "est plus grand que"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "est plus petit que"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "est plus long que"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "est plus court que"
 
@@ -5182,23 +5108,23 @@ msgstr "Exécuter la commande"
 msgid "Stop rule evaluation"
 msgstr "Arrêter l'évaluation de la règle"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "dossier :"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "adresse :"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Éditer la liste des en-têtes"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "En-têtes"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "En-tête :"
 
@@ -5364,7 +5290,7 @@ msgstr "Supprimer le modèle"
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
 
@@ -5387,11 +5313,11 @@ msgstr "L'envoi du message %d de la file d'attente a échoué.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "État"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Création du dialogue d'avancement...\n"
 
@@ -5403,97 +5329,66 @@ msgstr "Une erreur est survenue pendant la récupération des données.\n"
 msgid "Can't write to file.\n"
 msgstr "Impossible d'écrire dans le fichier.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops : signature non vérifiée"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Pas de signature trouvée"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Signature correcte"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "MAUVAISE signature"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Pas de clé publique pour vérifier la signature"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Erreur lors de la vérification de la signature"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Résultats différents pour les signatures"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Erreur : statut inconnu"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Signature correcte de \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Mauvaise signature de \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Pas d'ID utilisateur pour cette clé"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                alias \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Date de la signature : %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Empreinte de la clé : %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Erreur lors de la vérification de la signature"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Veuillez choisir la clé pour « %s »"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Récupération d'infos pour « %s » ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Sélection de clés"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID de la clé"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Validité"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Ajouter une clé"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Saisissez le nom d'un autre utilisateur ou l'ID de la clé :"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "L'en-tête du message en attente est corrompu.\n"
@@ -5580,15 +5475,78 @@ msgstr ""
 "Vous pouvez utiliser une boîte existante au format MH, si vous en avez une.\n"
 "Si vous n'êtes pas sûr, cliquez sur OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "/_Vérification de la signature"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s de \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Pas de signature trouvée"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Signature correcte de \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Signature correcte"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Date de la signature : %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Mauvaise signature de \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "MAUVAISE signature"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Pas de clé publique pour vérifier la signature"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH pas disponible\n"
@@ -5792,257 +5750,257 @@ msgstr "N°"
 msgid "Creating summary view...\n"
 msgstr "Création de la vue de l'index...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Chercher encore"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, 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:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(aucune date)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Sélection de tous les messages..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Suppression des threads pour exécution..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "le fichier %s existe déjà\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Création de la vue texte...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Pour enregistrer cette pièce, activer le menu contextuel avec "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "un clic droit et sélectionner « Enregistrer sous... », "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6050,11 +6008,11 @@ msgstr ""
 "ou appuyer sur la touche « y ».\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Pour afficher cette pièce comme du texte, sélectionner "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6062,35 +6020,35 @@ msgstr ""
 "« Afficher comme du texte », ou appuyer sur la touche « t ».\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Pour ouvrir cette pièce avec un programme externe, choisir "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "« Ouvrir » ou « Ouvrir avec... », "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ou double-cliquer, ou cliquer avec le bouton du milieu, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ou encore appuyer sur la touche « l »."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Cette signature n'a pas encore été vérifiée.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Pour la vérifier, ouvrir le menu contextuel avec\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "un clic droit et sélectionner « Vérifier la signature ».\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6126,6 +6084,42 @@ msgstr "%.2f Go"
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
+#~ msgid "Refresh"
+#~ msgstr "Rafraîchir"
+
+#~ msgid "Search"
+#~ msgstr "Rechercher"
+
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops : signature non vérifiée"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Résultats différents pour les signatures"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Erreur : statut inconnu"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                alias \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Empreinte de la clé : %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Label trouvé : %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index 823f9acd..5ea1a3ed 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -64,22 +64,6 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Aceptar"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuración de cada conta...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -129,30 +113,30 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Engadir"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Arriba"
@@ -161,13 +145,6 @@ msgstr "Arriba"
 msgid " Set as default account "
 msgstr " conta por defecto "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Pechar"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Borrar conta"
@@ -176,24 +153,15 @@ msgstr "Borrar conta"
 msgid "Do you really want to delete this account?"
 msgstr "¿Realmente quere borrar esta conta?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Non"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Executando: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizou: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Entrada/saida de accions"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Enviar "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -271,11 +239,11 @@ msgstr ""
 "Teclee o argumento para a seguinte acción:\n"
 "(`%s' será sustituido polo argumento)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -285,7 +253,7 @@ msgstr ""
 "Teclee o argumento para a seguinte acción:\n"
 "(`%s' será sustituido polo argumento)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -293,13 +261,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Notas"
 
@@ -307,24 +275,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -345,8 +296,8 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -364,7 +315,7 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
@@ -396,7 +347,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -405,12 +356,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -427,7 +378,7 @@ msgstr "/Novo _grupo"
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -437,7 +388,7 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -450,18 +401,18 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nome:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Borrar"
 
@@ -490,18 +441,6 @@ msgstr "Borrar enderezo(s)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "+Non"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -619,7 +558,7 @@ msgstr "Erro na conversión da axenda"
 msgid "Addressbook Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -663,360 +602,360 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Erro"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Creando o diálogo de alerta...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Mostrar este mensaxe de novo"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Laranxa"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Bermello"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Azul ceo"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir ó caracter anterior"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir ó caracter seguinte"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir á palabra anterior"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir á palabra seguinte"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir ó principio da línea"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir ó final da línea"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir á línea anterior"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir á línea seguinte"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar o caracter anterior"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar o caracter seguinte"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar a palabra anterior"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar a palabra seguinte"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar ata o final da línea"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Compoñer mensaxe%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1024,26 +963,26 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Non puiden atopar ningunha clave asociada con a Id-clave actual `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1054,138 +993,138 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "non se poden escribir as cabeceiras\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1196,66 +1135,66 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado proceso id.: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ficheiro temporal: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Compoñer: entrada dende proceso monitor\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Non se puido executar o editor externo\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Non se puido escribir no ficheiro\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Fallo lendo tubería\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Descartar Mensaxe"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "a Borrador"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Substituír"
 
@@ -1263,77 +1202,76 @@ msgstr "Substituír"
 msgid "Edit address"
 msgstr "Editar enderezo"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Engadir nova persoa"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Editar detalles persoais"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Debe especificarse un enderezo de correo."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Debe especificarse un Nome e un Valor"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Editar datos persoais"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Nome mostrado"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Nome"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Alcume"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Enderezo e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Arriba"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Abaixo"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Datos básicos"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributos do usuario"
 
@@ -1349,7 +1287,7 @@ msgstr "Non parece que o ficheiro esté no formato da axenda."
 msgid "Could not read file."
 msgstr "Non se puido leer do ficheiro."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Editar axenda"
 
@@ -1362,7 +1300,7 @@ msgstr " Comprobar ficheiro "
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Engadir nova axenda"
 
@@ -1394,32 +1332,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Enderezos disponibles"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover os enderezos de correo dende/cara o grupo con as flechas"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Editar detalles do grupo"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Engadir novo grupo"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -1431,11 +1369,11 @@ msgstr "Non parece que ese ficheiro esté en formato JPilot."
 msgid "Select JPilot File"
 msgstr "Seleccionar ficheiro JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1444,7 +1382,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Elemento(s) adicional(is) do enderezo"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Engadir nova entrada JPilot"
 
@@ -1452,63 +1390,63 @@ msgstr "Engadir nova entrada JPilot"
 msgid "Connected successfully to server"
 msgstr "Conectado con éxito o servidor"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Non se puido conectar o servidor"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Editar servidor LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Nome máquina"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Porto"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Comprobar servidor "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Base de búsqueda"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Criterio de búsqueda"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Limpar "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Asociar DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Asociar contrasinal"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Tiempo límite (seg.)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Basico"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Engadir novo servidor LDAP"
 
@@ -1520,7 +1458,7 @@ msgstr "Editar LDAP - Seleccionar base de búsqueda"
 msgid "Available Search Base(s)"
 msgstr "Base(s) de búsqueda disponible(s)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Non puiden ler a base de búsqueda do servidor - configúre-a manualmente"
@@ -1533,11 +1471,11 @@ msgstr "Non parece que o ficheiro esté en formato vCard."
 msgid "Select vCard File"
 msgstr "Seleccionar Ficheiro vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Editar entrada vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Engadir nova entrada vCard"
 
@@ -1566,10 +1504,10 @@ msgstr "Seleccionar..."
 msgid "Select exporting file"
 msgstr "Seleccione ficheiro de exportación"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
 
@@ -1577,41 +1515,41 @@ msgstr "fallo escribiendo a configuración a ficheiro\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -1674,65 +1612,65 @@ msgstr "Non leídos"
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Reconstruindo todos os arbores de carpetas..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1742,16 +1680,16 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1760,24 +1698,24 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1786,34 +1724,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -1845,10 +1783,6 @@ msgstr "Mensaxes"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Refrescar"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderado"
@@ -1861,15 +1795,15 @@ msgstr "so lectura"
 msgid "unknown"
 msgstr "desconecido"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Feito."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de novas recibidos (%s leídos)"
@@ -1886,11 +1820,11 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Sin remite)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -2127,7 +2061,7 @@ msgstr "Nome de atributo"
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -2151,7 +2085,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2167,135 +2101,135 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Finalizar"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2304,27 +2238,27 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Error de socket."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2333,12 +2267,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2347,15 +2281,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -2373,7 +2307,7 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2382,11 +2316,11 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non está soportado por glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2394,16 +2328,16 @@ msgstr ""
 "GnuPG non esta convenientemente instalado, ou é unha versión antiga.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2413,64 +2347,64 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3120,58 +3054,58 @@ msgstr "/_Axuda/_FAQ/_Italiano"
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separación de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3181,16 +3115,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3200,144 +3134,144 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Respostar ó mensaxe"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Seguinte non leído"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
@@ -3439,10 +3373,6 @@ msgstr "Maiús./minús."
 msgid "Backward search"
 msgstr "Buscar cara atrás"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Buscar"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Búsqueda fallida"
@@ -3467,28 +3397,28 @@ msgstr "Búsqueda concluida"
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Gardar como"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir o ficheiro existente?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3497,7 +3427,7 @@ msgstr ""
 "Teclee o comando para imprimir:\n"
 "(`%s' será sustituido por o ficheiro)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3557,7 +3487,7 @@ msgstr "Creando visor de MIME...\n"
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Texto"
 
@@ -3569,15 +3499,15 @@ msgstr "Adxuntos"
 msgid "Select \"Check signature\" to check"
 msgstr "Seleccione \"Verificar sinatura\" para verificar"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Non se pode gardar a parte da mensaxe multipartes."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Abrir con"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3586,7 +3516,7 @@ msgstr ""
 "Teclee o comando para abrir o Ficheiro:\n"
 "(`%s' será sustituido por o ficheiro)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "o comando do visor MIME non é válido: `%s'"
@@ -3692,15 +3622,15 @@ 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."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Frase contrasinal"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[sin id usuario]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3713,7 +3643,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3721,70 +3651,66 @@ msgstr ""
 "¡Contrasinal erróneo! Intenteo de novo...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Non se atopou no saudo a marca temporal APOP requerida\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "a marca temporal do saudo ten un erro de sintaxis\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "linea xover non válida: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Borrando mensaxe expirado %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Ignorando mensaxe %d (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "a caixa de correo está bloqueado\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "non podo abrir a sesión TLs\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "ocurriu algún erro na autenticación\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "Comando non soportado\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Atopado %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Aplicar"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
@@ -3806,11 +3732,11 @@ msgstr "Preferencias da conta"
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -3920,7 +3846,7 @@ msgstr "Descargar todas as mensaxes do servidor"
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3940,7 +3866,7 @@ msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automática"
 
@@ -3948,7 +3874,7 @@ msgstr "Automática"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Cabeceira"
 
@@ -3964,7 +3890,7 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4160,19 +4086,19 @@ msgstr ""
 "ASCII plano para mensaxes encriptados. Non cumple con o\n"
 "RFC 3156 - Seguridade MIME con OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "configuración das accions"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nome de menú:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Orde:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4207,43 +4133,43 @@ msgstr ""
 "   %F para a lista de nomes de ficheiro das mensaxes seleccionados\n"
 "   %p para a parte seleccionada da mensaxe."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Substituír "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Axuda sintaxis "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Accions rexistradas"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nova)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Non se estableceu o nome de menú."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Non se permiten dous puntos ':' no nome de menú."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "o nome do menú é demasiado longo."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "o nome de menú e o comando son demasiado longos."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4254,91 +4180,91 @@ msgstr ""
 "%s\n"
 "ten algún erro de sintaxis."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Borrar acción"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quere borrar esta acción?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Creando fiestra de preferencias comuns...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferencias comuns"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citar"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Ver"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Mensaxe"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Outras"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Programa externo"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Almacenamento local"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorporar do almacén"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrar ó incorporar"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Comprobar correo novo"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "cada"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Comproba correo novo ó inicio"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todas as carpetas locales despois de incorporar"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4346,115 +4272,115 @@ msgstr ""
 "Número máximo de artigos a descargar\n"
 "(sen límite si se especifica 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Gardar mensaxes enviados en Saida"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Codificación para enviar"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4462,11 +4388,11 @@ msgstr ""
 "Si se selecciona `Automático' utilizarase a\n"
 "codificación óptima para a localización actual."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Codificación de transferencia"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4474,115 +4400,115 @@ msgstr ""
 "Especificar a codificación de transferencia (Content-Transfer-Encoding)\n"
 "cando o corpo do mensaxe conten caracteres non-ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Separador de sinatura"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Inserir automáticamente"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Lanzar o editor externo automáticamente"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Niveles de desfacer"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Recortar mensaxes ós"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Recortar mentras se escribe"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Seleccionar automáticamente a conta para respostar"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citar a mensaxe ó respostar"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "o botón Respostar invoca respostar á lista de correo"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formato de réplica"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Marca de citación"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceiras (como `Dende:', `Asunto:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4590,64 +4516,64 @@ msgstr ""
 "Mostrar alfabéticos e numéricos multi-byte como\n"
 "caracteres ASCII (só para Xaponés)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Media páxina"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as imáxes adxuntas"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas automáticamente"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de sinatura"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4655,35 +4581,35 @@ msgstr ""
 "(Poniendo '0' mantendrá a contraseña\n"
 " durante toda a sesión)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4691,216 +4617,216 @@ msgstr ""
 "(Os mensaxes marcaránse hasta a execución\n"
 " si está desactivado)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrar diálogo de erro si hai erros de recepción"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción ó finalizar"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir dirección ó destino con doble click"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Ó sair"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Confirmar ó sair"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira ó sair"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como número usando o reloxo de 24 horas"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como número usando o reloxo de 12 horas"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4924,11 +4850,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4942,7 +4868,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4954,15 +4880,15 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Selección de fonte"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4972,31 +4898,31 @@ msgstr ""
 "Se poden modificar tamén os atallos dos menús pulsando\n"
 "calquer tecla(s) ó situar o ratón sobre o elemento do menú."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Configuración de cabeceiras de usuario"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "cabeceiras de usuario"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Non se estableceu o nome de cabeceira"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Borrar cabeceira"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "¿Quere borrar realmente esta cabeceira?"
 
@@ -5004,150 +4930,150 @@ msgstr "¿Quere borrar realmente esta cabeceira?"
 msgid "Creating display header setting window...\n"
 msgstr "Creando fiestra de visualización de propiedades de cabeceiras...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Cabeceira"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "cabeceiras mostradas"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "cabeceiras ocultas"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Mostrar todas as cabeceiras"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Lendo configuración para mostrar cabeceiras...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Escribindo configuración para mostrar cabeceiras...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Esa cabeceira xa existe na lista."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Preferencias de filtrado"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Para:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Copiar..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quere borrar realmente esta regra?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "cabeceiras ocultas"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Mensaxe"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "conten"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "non conten"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5204,27 +5130,27 @@ msgstr "Executar"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Carpeta"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Enderezo"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Cabeceira"
@@ -5395,7 +5321,7 @@ msgstr "Borrar plantilla"
 msgid "Do you really want to delete this template?"
 msgstr "¿Quere borrar realmente esta plantilla?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
@@ -5418,11 +5344,11 @@ msgstr "Fallo enviando mensaxe %d da cola.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Estado"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Creando diálogo de progreso...\n"
 
@@ -5434,97 +5360,66 @@ msgstr "ocurriu un erro mentras se obtían datos.\n"
 msgid "Can't write to file.\n"
 msgstr "Non se pode escribir ó ficheiro.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: sinatura no verificada"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Non se atopou sinatura"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Sinatura válida"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "Sinatura INVÁLIDA"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Non hai clave pública para verificar a sinatura"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Error ó verificar a sinatura"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Resultados diferentes para as sinaturas"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Error: Estado descoñecido"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Sinatura válida de \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Sinatura INVÁLIDA de \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Non atopo o ID de usuario para esta clave."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Sinatura feita en %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Pegada de clave: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Error ó verificar a sinatura"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Seleccione clave para `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Recollendo info para `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Seleccione teclas"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID tecla"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Engadir clave"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Teclee outro usuario ou ID-clave:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Cabeceira corrupta no mensaxe en cola.\n"
@@ -5613,15 +5508,78 @@ msgstr ""
 "si xa a ten.\n"
 "Si non está seguro, seleccione Aceptar."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Verificando sinatura"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s dende \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Non se atopou sinatura"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Sinatura válida de \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Sinatura válida"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Sinatura feita en %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Sinatura INVÁLIDA de \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "Sinatura INVÁLIDA"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Non hai clave pública para verificar a sinatura"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH non está disponible\n"
@@ -5825,258 +5783,258 @@ msgstr "Non."
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Queda algunha marca. ¿Procesa-la?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Sin data)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Seleccionando todas as mensaxes..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Desfacendo xerarquía para execución..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "o ficheiro %s xa existe\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Para gardar esta parte, abra o menu contextual con o "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "botón dereito e seleccione `Gardar como...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6084,11 +6042,11 @@ msgstr ""
 "ou pulse a tecla `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Para ver esta parte coma unha mensaxe de texto, seleccione "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6096,35 +6054,35 @@ msgstr ""
 "`Ver como texto', o pulse a tecla `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Para abrir esta parte con un programa externo seleccione "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Abrir' o `Abrir con...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ou doble-click, ou pulse o botón central, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ou pulse a tecla `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Esta sinatura ainda non foi verificada.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Para verificarla, abra o menu contextual con\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "o botón dereito e seleccione `Verificar sinatura'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6157,6 +6115,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#~ msgid "Close"
+#~ msgstr "Pechar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "No"
+#~ msgstr "+Non"
+
+#~ msgid "Refresh"
+#~ msgstr "Refrescar"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: sinatura no verificada"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Resultados diferentes para as sinaturas"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Error: Estado descoñecido"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Pegada de clave: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Atopada etiqueta: %s\n"
 
diff --git a/po/hr.po b/po/hr.po
index 82526395..6dda972b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -63,22 +63,6 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "U redu"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Čitam konfiguracije za svaki račun...\n"
@@ -112,11 +96,11 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -128,30 +112,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Uredi"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Obriši "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dolje"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gore"
@@ -160,13 +144,6 @@ msgstr "Gore"
 msgid " Set as default account "
 msgstr " Postavi kao uobičajeni račun "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zatvori"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Obriši račun"
@@ -175,24 +152,15 @@ msgstr "Obriši račun"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Ne"
 
@@ -233,31 +201,31 @@ msgid ""
 "%s"
 msgstr "Ne mogu izvršiti vanjsku naredbu: %s\n"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1094
+#: src/action.c:1095
 #, fuzzy
 msgid " Send "
 msgstr "Pošalji"
 
-#: src/action.c:1105
+#: src/action.c:1106
 #, fuzzy
 msgid "Abort"
 msgstr "O"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -267,11 +235,11 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -281,7 +249,7 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -289,13 +257,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Bilješke"
 
@@ -303,24 +271,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Odustani"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -342,8 +293,8 @@ msgstr "/_Datoteka/Novi _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -361,7 +312,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -393,7 +344,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -402,12 +353,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -424,7 +375,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -434,7 +385,7 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Uredi"
@@ -447,18 +398,18 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Ime:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Obriši"
 
@@ -487,18 +438,6 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ne"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -608,7 +547,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -653,373 +592,373 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Greška"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Stvaram sučelje za upozoravajući prozor...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Prikaži ovu poruku slijedeći put"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Narančasta"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Crvena"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Roza"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Nebesko plava"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Plava"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Smeđa"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u spis _nedovršeno"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Priloži datoteku"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/R_eži"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:483
+#: src/compose.c:479
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/compose.c:486
+#: src/compose.c:482
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/_Uredi/_Undo"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Sažmi _poglavlje"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:564
+#: src/compose.c:560
 #, fuzzy
 msgid "/_View/_To"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:565
+#: src/compose.c:561
 #, fuzzy
 msgid "/_View/_Cc"
 msgstr "/_Pregled"
 
-#: src/compose.c:566
+#: src/compose.c:562
 #, fuzzy
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:567
+#: src/compose.c:563
 #, fuzzy
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 #, fuzzy
 msgid "/_View/_Followup to"
 msgstr "/_Poruka/P_roslijedi"
 
-#: src/compose.c:571
+#: src/compose.c:567
 #, fuzzy
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:573
+#: src/compose.c:569
 #, fuzzy
 msgid "/_View/_Attachment"
 msgstr "Prilog"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:577
+#: src/compose.c:573
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim uređivačem"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvrši"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Uređeno]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1027,26 +966,26 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1054,141 +993,141 @@ msgid ""
 "Send it anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "ne mogu pisati zaglavlje\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME tip"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Uređivač"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1199,67 +1138,67 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ugašena grupa procesa: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa motrenja\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti vanjski uređivač\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu pisati u datoteku\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspjelo\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 #, fuzzy
 msgid "Replace"
 msgstr "Obrazac"
@@ -1268,77 +1207,76 @@ msgstr "Obrazac"
 msgid "Edit address"
 msgstr "Uredi adresu"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Dodaj novu osobu"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Uredi detalje osobe"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "E-mail adresa nije upisana."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Ime i iznos moraju biti upisani."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Uredi osobne podatke"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-mail adresa"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Pomakni gore"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Pomakni dolje"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Promjeni"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Iznos"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Osnovno"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributi korisnika"
 
@@ -1354,7 +1292,7 @@ msgstr "Datoteka nije u formatu adresara."
 msgid "Could not read file."
 msgstr "Ne mogu čitati datoteku."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
@@ -1367,7 +1305,7 @@ msgstr " Provjeri datoteku "
 msgid "File"
 msgstr "Datoteka"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Dodaj Novi Adresar"
 
@@ -1399,32 +1337,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomaknite E-mail adrese prema ili od grupe sa strelicama"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Uredi detalje grupe"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Uredi spis"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -1436,11 +1374,11 @@ msgstr "Datoteka nije JPilot formata."
 msgid "Select JPilot File"
 msgstr "Odaberite JPilot datoteku"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1449,7 +1387,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Dodatne pojedinosti e-Mail adrese"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Dodajte novi JPilot unos"
 
@@ -1457,63 +1395,63 @@ msgstr "Dodajte novi JPilot unos"
 msgid "Connected successfully to server"
 msgstr "Uspješno spojen na server"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ne mogu se povezati na server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Uredi LDAP Poslužitelj"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Provjeri Poslužitelj "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Baza potrage"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Kriterij potrage"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Ponovo "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind Lozinka"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Produženo"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Novi LDAP Poslužitelj"
 
@@ -1525,7 +1463,7 @@ msgstr "Uredit LDAP - Odabir Baze Potrage"
 msgid "Available Search Base(s)"
 msgstr "Dostupne Baze"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Ne mogu čitati Baze Potrage sa servera - molim postavite ručno"
 
@@ -1537,11 +1475,11 @@ msgstr "Datoteka nije V-kartica formata."
 msgid "Select vCard File"
 msgstr "Odaberite V-kartica datoteku"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Uredite V-kartica unose"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Dodaj Novi V-kartica Unos"
 
@@ -1570,10 +1508,10 @@ msgstr " Odaberite... "
 msgid "Select exporting file"
 msgstr "Odaberite datoteku za iznošenje"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
 
@@ -1581,43 +1519,43 @@ msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -1682,69 +1620,69 @@ msgstr "Nepročitano"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 #, fuzzy
 msgid "Rebuilding all folder trees..."
 msgstr "Pretražujem sva stabla spisa..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1754,16 +1692,16 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1772,24 +1710,24 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1798,35 +1736,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -1858,10 +1796,6 @@ msgstr "Poruke"
 msgid "Type"
 msgstr "Tip"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Osvježi"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderirano"
@@ -1874,15 +1808,15 @@ msgstr "read only"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
@@ -1899,11 +1833,11 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -2149,7 +2083,7 @@ msgstr "Atributi korisnika"
 msgid "Attribute"
 msgstr "Atributi korisnika"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Odaberi"
 
@@ -2176,7 +2110,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Slijedeća"
 
@@ -2194,196 +2128,196 @@ msgstr "Atributi korisnika"
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:535
+#: src/inc.c:536
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:612
+#: src/inc.c:613
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:621
+#: src/inc.c:622
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, 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:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -2401,7 +2335,7 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2410,11 +2344,11 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nije podržan od glib-a.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2423,81 +2357,81 @@ msgstr ""
 "GnuPG nije pravilno instaliran.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:411
+#: src/main.c:429
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3217,58 +3151,58 @@ msgstr "/_Pomoć/_Priručnik/_Engleski"
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3278,16 +3212,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3296,147 +3230,147 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih računa"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruke"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Prosljeđuje poruku"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Briše poruke"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Postavke računa"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3538,10 +3472,6 @@ msgstr "Osjetljiv na velika/mala slova"
 msgid "Backward search"
 msgstr "Potraga unatraške"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Potraga"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Polje potrage"
@@ -3566,28 +3496,28 @@ msgstr "Potraga završena"
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Spremi kao"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Prepisati postojeću datoteku?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3596,7 +3526,7 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3656,7 +3586,7 @@ msgstr "Stvaram MIME pregled...\n"
 msgid "MIME Type"
 msgstr "MIME tip"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3669,15 +3599,15 @@ msgstr "Prilog"
 msgid "Select \"Check signature\" to check"
 msgstr "Odaberite \"Provjeri potpis\" za provjeru"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Ne mogu spremiti dio višedjelne poruke"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Otvori s"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3686,7 +3616,7 @@ msgstr ""
 "Unesite naredbu za otvaranje datoteke:\n"
 "(`%s' je sinonim za ime datoteke)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME preglednika nije ispravna: `%s'"
@@ -3792,15 +3722,15 @@ 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."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[nema ID korinika]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3813,7 +3743,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3821,74 +3751,70 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nužni APOP timestamp nije pronađen u pozdravu\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntax greška u timestampu kod pozdrava\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol greška\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, fuzzy, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "Brišim duplicirane poruke..."
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, fuzzy, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: src/pop.c:660
+#: src/pop.c:655
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Postavke sandučića"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "Korsiti STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom ovjeravanja\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Pronađen %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Primjeni"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za postavke računa...\n"
@@ -3910,11 +3836,11 @@ msgstr "Postavke računa"
 msgid "Creating account preferences window...\n"
 msgstr "Kreiram prozor za postvake računa...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -4026,7 +3952,7 @@ msgstr "Primi sve poruke sa poslužitelja"
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -4047,7 +3973,7 @@ msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr ""
 
@@ -4056,7 +3982,7 @@ msgstr ""
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' uzima poštu s ovog računa"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Zaglavlje"
 
@@ -4072,7 +3998,7 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4269,22 +4195,22 @@ msgid ""
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 #, fuzzy
 msgid "Menu name:"
 msgstr "Puno ime"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 #, fuzzy
 msgid "Command line:"
 msgstr "Naredba"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4306,47 +4232,47 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Obrazac"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr ""
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 #, fuzzy
 msgid "Registered actions"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Novo)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 #, fuzzy
 msgid "Menu name is not set."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 #, fuzzy
 msgid "Command line not set."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4354,93 +4280,93 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 #, fuzzy
 msgid "Delete action"
 msgstr "Obriši račun"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 #, fuzzy
 msgid "Do you really want to delete this action?"
 msgstr "Želite li usitinu obrisati ovaj račun?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Stvaram prozor za uobičajene postavke...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Uobičajene postavke"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Pošta"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Vanjski program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Koristi vanjski program za prihvat"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokalni spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvaćanju"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Auto-provjera nove pošte"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Provjeri poštu prilikom starta"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Osvježi sve spise poslije prihvaćanja"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4448,116 +4374,116 @@ msgstr ""
 "Maksimalni broj članaka za skidanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Spremi poslane poruke u poslano"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Izlazni charset"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Europski (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4565,230 +4491,230 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišten."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Razdjelnik potpisa"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni vanjski uređivač"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 #, fuzzy
 msgid "Wrap on input"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Sažmi prije slanja"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi račun pri odgovaranju"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Odgovori svi_ma"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Format prosljeđivanja"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 #, fuzzy
 msgid "letters"
 msgstr "Obriši"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 #, fuzzy
 msgid "Expired after"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
 msgstr ""
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka neće biti primljena\n"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Pošta/O_tvori u novom prozoru"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sandučić nakon primanja pošte"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4796,218 +4722,218 @@ msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Pitaj prije pražnjenja"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -5031,11 +4957,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5044,7 +4970,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5052,48 +4978,48 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Odabir fonta"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr ""
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Postaljvanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Određeno zaglavlje"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Obriši zaglavlje"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Uistinu obrisati ovo zaglavlje?"
 
@@ -5101,150 +5027,150 @@ msgstr "Uistinu obrisati ovo zaglavlje?"
 msgid "Creating display header setting window...\n"
 msgstr "Kreiram prozor postavki zaglavlja...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Ime zaglavlja"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Prikazana zaglavlja"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skrivena zaglavlja"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Prikaži sva nedefinirana zaglavlja"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Čitam konfiguraciju za prikaz zaglavlja...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Pišem konfiguraciju za prikaz zaglavlja...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Ovo zaglavlje je već na listi."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Postavke filtera"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Za:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopiraj..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Uistinu obrisati pravilo?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Pošta"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "sadrži"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadrži"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5301,27 +5227,27 @@ msgstr "Izvrši"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Spis"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
@@ -5494,7 +5420,7 @@ msgstr "Briši obrazac"
 msgid "Do you really want to delete this template?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
@@ -5517,11 +5443,11 @@ msgstr "Slanje odložene poruke %d nije uspjelo.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Kreiram dijalog napretka...\n"
 
@@ -5533,98 +5459,67 @@ msgstr "došlo je do greške prilikom prihvaćanja podataka.\n"
 msgid "Can't write to file.\n"
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Upss: Potpis nije potvrđen"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Nema potpisa"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Dobar potpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "LOŠ potpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nema javnog ključa za potvrdu potpisa"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Greška pri potvrđivanju potpisa"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Različiti rezultati za potpise"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Greška: Nepoznat status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Dobar potpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, fuzzy, c-format
-msgid "BAD signature from \"%s\""
-msgstr "LOŠ potpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Ne mogu naći ID korisnika za ovaj ključ."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Potpis napravio/la %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Otisak ključa: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Greška pri potvrđivanju potpisa"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Molim, odaberite ključ za `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Primam info za `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Odaberite ključeve"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID ključa"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Oznaka"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 #, fuzzy
 msgid "Enter another user or key ID:"
 msgstr "Upišite drugi ID ključa ili korisnika\n"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
@@ -5714,16 +5609,79 @@ msgstr ""
 "ako imate jedan.\n"
 "Ako niste sigurni, odaberite U redu."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 #, fuzzy
 msgid "Checking signature"
 msgstr "/Pro_vjeri potpis"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Nema potpisa"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Dobar potpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Dobar potpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Potpis napravio/la %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, fuzzy, c-format
+msgid "BAD signature from \"%s\""
+msgstr "LOŠ potpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "LOŠ potpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nema javnog ključa za potvrdu potpisa"
+
 #: src/smtp.c:151
 #, fuzzy
 msgid "SMTP AUTH not available\n"
@@ -5934,263 +5892,263 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Kreiram pregled održavanja...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 #, fuzzy
 msgid "Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 #, 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:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Odabirem sve poruke..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Rasipavam za izvršenje..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, fuzzy, c-format
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Kreiram pregled teksta...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Za spremanje ovog dijela, podignite menu konteksta s "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "desnim klikom i odaberite `Spremi kao...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6198,11 +6156,11 @@ msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Za prikaz ovog dijela kao tekst, odaberite "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6210,35 +6168,35 @@ msgstr ""
 "`Prikaži kao tekst' ili pritisnite `t' tipku.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Za prikaz ovog dijela s vanjskim programom, odaberite "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Otvori' ili `Otvori s...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ili dva put kliknite, ili kliknite srednju tipku, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ili pritisnite tipku `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Ovaj potpis još nije provjeren.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Za prvojeru, podignite kontekst menu s\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "desnom tipkom i odaberite `Provjeri potpis'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6271,6 +6229,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
 
+#~ msgid "OK"
+#~ msgstr "U redu"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Refresh"
+#~ msgstr "Osvježi"
+
+#~ msgid "Search"
+#~ msgstr "Potraga"
+
+#~ msgid "Apply"
+#~ msgstr "Primjeni"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Upss: Potpis nije potvrđen"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Različiti rezultati za potpise"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Greška: Nepoznat status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Otisak ključa: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Pronađena oznaka: %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index f79b195f..04f0e836 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2003-07-26 22:58-0100\n"
 "Last-Translator: Zahemszky Gábor <Gabor@Zahemszky.HU>\n"
 "Language-Team: Hungarian <gnome-hu@gnome.org>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Rendben"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
@@ -115,11 +99,11 @@ msgstr ""
 "funkció bekapcsolásához válaszd ki a 'G' oszlopban a jelölődobozt!"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Név"
 
@@ -131,30 +115,30 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Szerver"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Törlés"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Le"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Fel"
@@ -163,13 +147,6 @@ msgstr "Fel"
 msgid " Set as default account "
 msgstr " Alapértelmezett hozzáférésként beállít "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Bezárás"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Hozzáférés törlése"
@@ -178,24 +155,15 @@ msgstr "Hozzáférés törlése"
 msgid "Do you really want to delete this account?"
 msgstr "Tényleg töröljem ezt a hozzáférést?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Igen"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nem"
 
@@ -242,29 +210,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- %s futtatása\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- %s befejeződött\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Művelet bemenete/kimenete"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Küldés"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Megszakítás"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -275,11 +243,11 @@ msgstr ""
 "(`%%h' a paraméterrel helyettesítődik)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "A művelet rejtett felhasználói paramétere"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -290,7 +258,7 @@ msgstr ""
 "(`%%u' a paraméterrel helyettesítődik)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "A művelet felhasználói paramétere"
 
@@ -298,13 +266,13 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címlistához"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Megjegyzések"
 
@@ -312,24 +280,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Fájl"
@@ -350,8 +301,8 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fájl/Új _Szerver"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -369,7 +320,7 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
@@ -401,7 +352,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -410,12 +361,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl import"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Segítség"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Segítség/_Névjegy"
@@ -432,7 +383,7 @@ msgstr "/Új cso_port"
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -442,7 +393,7 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
@@ -455,18 +406,18 @@ msgstr "/_Törlés"
 msgid "E-Mail address"
 msgstr "E-Mail cím"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Név:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Törlés"
 
@@ -495,18 +446,6 @@ msgstr "Cím(ek) törlése"
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nem"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -620,7 +559,7 @@ msgstr "Címjegyzék konverziós hiba"
 msgid "Addressbook Conversion"
 msgstr "Címjegyzék konverzió"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Illesztő"
 
@@ -664,359 +603,359 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Hiba"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Figyelmeztetőpanel dialógus létrehozása...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Mutasd ezt az üzenetet legközelebb"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Narancs"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Vörös"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rózsaszín"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Égszínkék"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Kék"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zöld"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Barna"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Mentés"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Üzenet/Küldés később"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Üzenet/Mentés _vázlatként"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Üzenet/Mentés és marad _szerkesztésben"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Szerkesztés/_Visszavonás"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Szerkesztés/_Kivágás"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Szerkesztés/_Beillesztés"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Szerkesztés/_Haladó"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/S_zerkesztés/_Haladó/Karakter mozgatása visszafelé"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/S_zerkesztés/_Haladó/Karakter mozgatása előrefelé"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/S_zerkesztés/_Haladó/Szó mozgatása visszafelé"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/S_zerkesztés/_Haladó/Szó mozgatása előrefelé"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/S_zerkesztés/_Haladó/Sor elejére mozgatás"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/S_zerkesztés/_Haladó/Sor végére mozgatás"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/S_zerkesztés/_Haladó/Előző sorba mozgatás"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/S_zerkesztés/_Haladó/Következő sorba mozgatás"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/S_zerkesztés/_Haladó/Karakter törlése visszafelé"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/S_zerkesztés/_Haladó/Karakter törlése előrefelé"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/S_zerkesztés/_Haladó/Szó törlése visszafelé"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/S_zerkesztés/_Haladó/Szó törlése előrefelé"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/S_zerkesztés/_Haladó/Sor törlése"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/S_zerkesztés/_Haladó/Törlés sor végéig"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Szerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/__Szerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/_Másolás"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Nézet/_Nyomkövetés"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/_Csatolás"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/__Szerkesztés/Szerkesztés _külső programmal"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/_Akciók"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Üzenet/_Titkosít"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Üzenet válasz/továbbítás formátum hiba."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem meghatározható\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "A %s fájl üres."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 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:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Üzenet írása%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Üzenet írása%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Nincs címzett."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Küldés"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldöd?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1024,27 +963,27 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Kérek válassz ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak küldendő üzenet küldése közben."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Az üzenet nem menthető a kimenő mappába."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1055,138 +994,138 @@ msgstr ""
 "%s-ról %s-ra.\n"
 "Elküldjem ennek ellenére?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "fejléc nem írható\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "a régi üzenetet nem tudom eltávolítani\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "üzenet a Várakozó sorba...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "nem találom a Várakozó sor mappáját\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Üzenet-azonosító: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME típus"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Üzenet a Várakozó sorba, küldés később"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Aláírás beillesztése"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Szerkesztő"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,66 +1136,66 @@ msgstr ""
 "Processz kilövése?\n"
 "processz csoport azonosító: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "A leállított processz csoport azonosítója: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ideiglenes fájl: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Szerkesztés: bemenet a monitorozó processzből\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Külső szerkesztő nem indítható\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Nem tudok a fájlba írni\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Hiba történt a csővezeték olvasása közben\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Üzenet elvetése"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Az üzenet megváltozott. Eldobjam?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Elvet"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "vázlatok közé"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni akarod a `%s' sablont?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Helyettesít"
 
@@ -1264,77 +1203,76 @@ msgstr "Helyettesít"
 msgid "Edit address"
 msgstr "Cím szerkesztése"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Új személy hozzáadása"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Személy tulajdonságainak szerkesztése"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Egy E-mail címet meg kell adni."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Nevet és értéket kell adni."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Személy adatainak szerkesztése"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Név kijelzése"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Keresztnév"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Becenév"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Álnév"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Mozgatás fel"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Mozgatás le"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Módosít"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Töröl"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Érték"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Alap adatok"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Felhasználó tulajdonságai"
 
@@ -1350,7 +1288,7 @@ msgstr "A fájl nem tűnik érvényes címjegyzéknek."
 msgid "Could not read file."
 msgstr "A fájl nem olvasható."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Címjegyzék szerkesztése"
 
@@ -1363,7 +1301,7 @@ msgstr " Fájl ellenőrzése"
 msgid "File"
 msgstr "Fájl"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Új címjegyzék hozzáadása"
 
@@ -1395,32 +1333,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Elérhető címek"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "E-mail címek mozgatása csoportból vagy csoportba a nyilakkal"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Csoport tulajdonságainak szerkesztése"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Új csoport hozzáadása"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Mappa szerkesztése"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -1432,11 +1370,11 @@ msgstr "A fájl nem tűnik JPilot formátumúnak."
 msgid "Select JPilot File"
 msgstr "JPilot fájl választása"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1445,7 +1383,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "További E-mail címek"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Új JPilot bejegyzés hozzáadása"
 
@@ -1453,63 +1391,63 @@ msgstr "Új JPilot bejegyzés hozzáadása"
 msgid "Connected successfully to server"
 msgstr "Sikeresen kapcsolódtam a szerverhez"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Nem tudtam kapcsolódni a szerverhez"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "LDAP szerver szerkesztése"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Gépnév"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Szerver ellenőrzés"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Keresés bázisa"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Keresési kritérium"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Nullázás "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind jelszó"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Időtúllépés (sec)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Alap"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Kiterjesztett"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Új LDAP szerver hozzáadása"
 
@@ -1521,7 +1459,7 @@ msgstr "LDAP szerkesztés - Keresési bázis választás"
 msgid "Available Search Base(s)"
 msgstr "Elérhető keresési bázis(ok)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Keresési bázis(ok) nem olvasható(k) a szerverről - kérem kézzel beállítani"
@@ -1534,11 +1472,11 @@ msgstr "A fájl nem tűnik vCard formátumúnak."
 msgid "Select vCard File"
 msgstr "vCard fájl kiválasztása"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "vCard bejegyzés szerkesztése"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Új vCard bejegyzés hozzáadása"
 
@@ -1567,10 +1505,10 @@ msgstr " Kiválaszt... "
 msgid "Select exporting file"
 msgstr "Exportálandó fájl választás"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem tudtam elmenteni\n"
 
@@ -1578,41 +1516,41 @@ msgstr "a beállításokat nem tudtam elmenteni\n"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -1675,65 +1613,65 @@ msgstr "Olvasatlan"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Az összes mappafa újraépítése..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenet küldése ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a %s-nak küldendő üzenet küldése közben."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1743,16 +1681,16 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretnél létrehozni,\n"
 "akkor tegyél egy `/'-t a név végére)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Kérem `%s' új nevét:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1761,24 +1699,24 @@ msgstr ""
 "`%s' minden mappája és üzenete törlődik.\n"
 "Tényleg ezt akarod?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1787,34 +1725,34 @@ msgstr ""
 "`%s' postaládát tényleg eltávolítsam?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg töröljem a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' hírcsoportot tényleg töröljem?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' hír hozzáférést tényleg töröljem?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Hír hozzáférés törlése"
 
@@ -1846,10 +1784,6 @@ msgstr "Üzenetek"
 msgid "Type"
 msgstr "Típus"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Frissítés"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderált"
@@ -1862,15 +1796,15 @@ msgstr "csak olvasható"
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem tudom olvasni a hírcsoportok listáját."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Kész."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoportot megkaptam (%s olvasott)"
@@ -1887,11 +1821,11 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -2125,7 +2059,7 @@ msgstr "Tulajdonság név"
 msgid "Attribute"
 msgstr "Tulajdonság"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Választ"
 
@@ -2149,7 +2083,7 @@ msgstr "LDIF fájl importálása a címjegyzékbe"
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Következő"
 
@@ -2165,134 +2099,134 @@ msgstr "Tulajdonságok"
 msgid "Finish"
 msgstr "Vége"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Új üzenetek fogadása"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Befejeződött (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Befejeződött (nincs új üzenet)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Időtúllépés (sec)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Vége (%d db új üzenet)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Kész (nincs új üzenet)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt az E-mailek fogadásakor."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hozzáférésről az új üzenetek letöltése...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új üzenetek fogadása"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a %s POP3 szerverhez ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Üzenetek fogadása %s-ból..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új üzenetek számának megszerzése (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új üzenetek számának megszerzése (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új üzenetek számának megszerzése (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új üzenetek méretének megszerzése (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Üzenet törlése %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Üzenet vétele (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Üzenetek fogadása (%d üzenet (%s) fogadott)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Hiba az E-mail feldolgozása közben."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2301,27 +2235,27 @@ msgstr ""
 "Hiba az E-mail feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Nem tudok a fájlba írni."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Socket hiba."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "A túloldal bezárta a kapcsolatot."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2330,11 +2264,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2343,16 +2277,16 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "kapcsolat időtúllépése\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Egyesítés megszakítva\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Új üzenetek megszerzése %s-tól %s-ba...\n"
@@ -2370,7 +2304,7 @@ msgstr "Kérem a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2379,11 +2313,11 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread-et a glib nem támogatja.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2391,16 +2325,16 @@ msgstr ""
 "A GnuPG nincs megfelelően telepítve, vagy túl régi verzió.\n"
 "OpenPGP támogatás kikapcsolva."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2410,23 +2344,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új üzenetek vétele"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új üzenetek vétele minden hozzáférésről"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...  üzenetek számának kijelzése"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2434,40 +2368,40 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       az összes mappa státuszának kijelzése"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Üzenet szerkesztés alatt. Tényleg kilépsz?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Várakozó üzenetek"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen üzenetek. Kilépés most?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "Egy másik Sylpheed már fut.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Műveletek beállítása"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3117,58 +3051,58 @@ msgstr "/_Segítség/_GYIK/_Olasz"
 msgid "/_Help/---"
 msgstr "/_Segítség/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elválasztás típus változtatása %d-ról, %d-ra\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3178,16 +3112,16 @@ msgstr ""
 "Ha már létezik a postaláda, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3196,144 +3130,144 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa nézet"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Válasz másnak/a _feladónak"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Válasz másnak/_levelezőlistának"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Csatolásként továbbít"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Fogadás"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Új E-mailek fogadása"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Mind fogadása"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Új E-mail fogadása minden hozzáférésen"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Szerkesztés"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Új üzenet szerkesztése"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Válasz"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Válasz az üzenetre"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Válasz mindre"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Válasz mindenkinek"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Továbbít"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Üzenet továbbítása"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Üzenet törlése"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Következő olvasatlan üzenet"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Hozzáférés"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Hozzáférés beállítások"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
@@ -3435,10 +3369,6 @@ msgstr "Nagy-/kis-betű érzékenység"
 msgid "Backward search"
 msgstr "Keresés visszafelé"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Keresés"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Keresés sikertelen"
@@ -3463,28 +3393,28 @@ msgstr "Keresés befejeződött"
 msgid "Creating message view...\n"
 msgstr "Üzenet nézet létrehozása...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Mentés másként"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem tudom elmenteni."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3493,7 +3423,7 @@ msgstr ""
 "Kérem a nyomtatási parancsot:\n"
 "(`%s' helyére a fájlnév kerül)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3553,7 +3483,7 @@ msgstr "MIME nézet létrehozása...\n"
 msgid "MIME Type"
 msgstr "MIME típus"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Szöveg"
 
@@ -3566,15 +3496,15 @@ msgid "Select \"Check signature\" to check"
 msgstr ""
 "Válassza ki a \"Digitális aláírás ellenőrzése\" pontot az ellenőrzéshez"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Egy többrészes üzenet egy darabja nem menthető."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Megnyitás mint"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3583,7 +3513,7 @@ msgstr ""
 "Kérem a fájl megnyitásához szükséges parancsot:\n"
 "(`%s' helyére a fájlnév kerül)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
@@ -3689,15 +3619,15 @@ msgstr "Hiba küldés közben\n"
 msgid "Error occurred while sending command\n"
 msgstr "Hiba történt üzenetküldés közben."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Jelmondat"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[nincs felhasználói azonosító]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3710,7 +3640,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3718,70 +3648,66 @@ msgstr ""
 "Rossz jelmondat! Még egyszer...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 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"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Időpecsét szintaktikai hiba az üdvözletben\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokollhiba\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "érvénytelen hírjegyzék sor: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Lejárt üzenetek törlése %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: üzenet átugrása %d (%d byte)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "a postafiók zárolt\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "kapcsolat időtúllépése\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "nem tudok TLS menetet indítani\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Hiba történt azonosításkor\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "A parancs nem támogatott\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Találtam %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Alkalmaz"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Hozzáférések beállítása...\n"
@@ -3803,11 +3729,11 @@ msgstr "Hozzáférés beállítások"
 msgid "Creating account preferences window...\n"
 msgstr "Hozzáférések beállítása ablak megnyitása...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Magánszféra"
 
@@ -3917,7 +3843,7 @@ msgstr "Minden üzenet letöltése a szerverről"
 msgid "Receive size limit"
 msgstr "Fogadott levél méretkorlát"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3937,7 +3863,7 @@ msgstr "(A nem szűrt üzenetek ebbe a mappába kerülnek)"
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -3945,7 +3871,7 @@ msgstr "Automatikus"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Mindent fogad' ellenőrizze ezt a hozzáférést is"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Fejléc"
 
@@ -3961,7 +3887,7 @@ msgstr "Üzenet-azonosító generálása"
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
@@ -4156,19 +4082,19 @@ msgstr ""
 "használata titkosított üzenetekhez. Nem felel meg az\n"
 "RFC 3156 - MIME Security with OpenPGP-ben leírtaknak."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Műveletek beállítása"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menü név:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Parancssor:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4209,43 +4135,43 @@ msgstr ""
 " %h egy felhasználó által megadott rejtett paraméter\n"
 " %s a kijelölt szövegrész"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr "Helyettesít"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Szintaxis segítség"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Regisztrált műveletek"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Új)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menü név nincs beállítva."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Kettőspont ':' nem használható menünévben."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "A menünév túl hosszú."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Nincs beállítva a parancssor."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menünév és parancs túl hosszú."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4256,91 +4182,91 @@ msgstr ""
 "parancs\n"
 "szintaktikai hibát tartalmaz."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Művelet törlése"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Tényleg töröljem ezt a műveletet?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Általános beállítások ablak létrehozása...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Általános beállítások"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Idézet"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Egyéb"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Külső program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Külső program használata E-mail fogadáshoz"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Parancs"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Helyi tároló"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Fogadás tárolóból"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Szűrés fogadás közben"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automatikus levélfigyelés"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "minden"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "perc"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Új levelek ellenőrzése induláskor"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Fogadás után minden lokális mappa frissítése"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Hírek"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4348,115 +4274,115 @@ msgstr ""
 "Maximum ennyi cikk letöltése\n"
 "(0 esetén korlátlan)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Külső program használata küldéshez"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Elküldött üzenetek mentése a Kimenő postafiókba"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Kimenő üzenetek kódkészlete"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatikus (Ajánlott)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bites ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Nyugat Európai (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Közép Európai (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikumi (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikumi (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirill (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4464,11 +4390,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást\n"
 "használom a helyi nyelvi beállításoknak megfelelően."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Átvitel kódolása"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4476,115 +4402,115 @@ msgstr ""
 "Határozd meg a Content-Transfer-Encoding értékét\n"
 "ha az üzenet tartalmaz nem-ASCII karaktereket is."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Aláírás elválasztó"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Automatikus beillesztés"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Külső szerkesztő automatikus indítása"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Visszavonás mélysége"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Sortörés helye"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Idézet törése"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Bevitel tördelése"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Sortördelés küldés előtt"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automatikus hozzáférés választás válaszkor"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Üzenet idézése a válaszban"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "A `Válasz' gomb a `Válasz levelező listára' funkciót hozza fel"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Válasz formátuma"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Idézet jele"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Továbbítási formátuma"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Szimbólumok leírása "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Betűkészlet"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Fejléc fordítása (mint `Feladó:', `Tárgy:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "levél"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Összefoglaló nézet"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Címzett mutatása a `Feladó' oszlopban ha önmagadnak küldted"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Dátum formátuma"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Összefoglalás kijelzésének beállítása... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Színek használata az üzenetekhez"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4592,64 +4518,64 @@ msgstr ""
 "Több byte-os karakterek és számok megjelenítése\n"
 "ASCII karakterekkel (csak japán esetén)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Fejlécmező megjelenítése az üzenet fölött"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Rövid fejlécek az üzenet nézetben"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Sortávolság"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "Képpont"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Fél oldal"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Finom görgetés"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Lépés"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "A csatolt képek átméretezése"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Digitális aláírás automatikus ellenőrzése"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes tárolása a memóriában"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Lejár, után"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4657,35 +4583,35 @@ msgstr ""
 "('0'-ra állítva  a kapcsolódás teljes időtartamára\n"
 " tárolja a jelmondatot)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkapása egy jelmondat beadásakor"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Az üzenetek mindig összefoglalva jelennek meg, ha ez kiválasztott"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Mappába lépéskor az első olvasatlan üzenet megnyitása"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az új ablakban megnyitott üzeneteket jelölje olvasottként."
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Váltson a bejövő postafiókra e-mail fogadás után"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali végrehajtás üzenet mozgatás vagy törlés esetén"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4693,216 +4619,216 @@ msgstr ""
 "(Az üzenetek kijelölten láthatók a feldolgozáskor,\n"
 " ha ez kikapcsolt állapotban van)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Fogadó ablak"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Fogadó ablak mutatása"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Fogadó ablak bezárása ha végzett"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Billentyű hozzárendelések... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Kilépéskor"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Ürítés előtt rákérdez"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen üzenetek esetén figyelmeztet"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Hálózati adatátvitel időtúllépés:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "másodperc"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "óra számként (24 órás kijelzés)"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "óra számként (12 órás kijelzés)"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Üzenetszín beállítása"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4926,11 +4852,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Üzenet-azonosító"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4944,7 +4870,7 @@ msgstr ""
 "Idézett üzenet törzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4956,15 +4882,15 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Betűtípus választás"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4974,31 +4900,31 @@ msgstr ""
 "Módosíthatod minden menü gyorsbillentyűjét, ha az egérmutatóval\n"
 "rámutatva megnyomod a kívánt billentyűt."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Saját fejléc beállítások"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Saját fejléc"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Fejléc név nincs beállítva."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Fejléc törlése"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Tényleg töröljem ezt a fejlécet?"
 
@@ -5006,150 +4932,150 @@ msgstr "Tényleg töröljem ezt a fejlécet?"
 msgid "Creating display header setting window...\n"
 msgstr "Fejléc beállító ablak létrehozása...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Fejléc beállítások"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Fejléc név"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Megjelenített fejlécek"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Rejtett fejlécek"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Az összes meghatározatlan fejléc mutatása"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Megjelenítő fejlécek beállításainak beolvasása...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Megjelenítő fejlécek beállításainak mentése...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Ez a fejléc már szerepel a listán."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Szűrő beállítása"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Címzett:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Másolás..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Szabály törlése"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Tényleg töröljem ezt a szabályt?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Szabály törlése"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Rejtett fejlécek"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Fejléc"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Üzenet"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "tartalmaz"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nem tartalmaz"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5206,27 +5132,27 @@ msgstr "Futtatás"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Mappa"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Cím"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Fejléc"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Fejléc"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Fejléc"
@@ -5397,7 +5323,7 @@ msgstr "Sablon törlése"
 msgid "Do you really want to delete this template?"
 msgstr "Tényleg töröljem ezt a sablont?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
@@ -5420,11 +5346,11 @@ msgstr "Hiba a %d besorolt üzenet küldésekor.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Állapot"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Készültségi ablak létrehozása...\n"
 
@@ -5436,97 +5362,66 @@ msgstr "hiba az adatok fogadása közben.\n"
 msgid "Can't write to file.\n"
 msgstr "Nem tudok a fájlba írni.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Hopp: a digitális aláírás nem ellenőrzött"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Nem találtam digitális aláírást"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Jó digitális aláírás"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "ROSSZ digitális aláírás"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nincs publikus kulcs az aláírás ellenőrzéséhez"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Hiba az aláírás ellenőrzése közben"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Eltérő eredmények az aláíráshoz"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Hiba: ismeretlen állapot"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Jó digitális aláírás \"%s\"-tól"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "ROSSZ digitális aláírás \"%s\"-tól"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Nem találok felhasználói azonosítót ehhez a kulcshoz."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                azaz \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Az aláírás készült %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Kulcs ujjlenyomat: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Hiba az aláírás ellenőrzése közben"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Válassz kulcsot '%s'-nak "
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Információ gyűjtés '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Kulcs választás"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Kulcs azonosító"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Kulcs hozzáadás"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Kérek egy másik felhasználót vagy kulcs azonosítót:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "A várakozó üzenet fejléce sérült.\n"
@@ -5613,15 +5508,78 @@ msgstr ""
 "Használhatsz egy létező MH formátumú postaládát is.\n"
 "Ha bizonytalan vagy, válaszd az OK-t!"
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Digitális aláírás ellenőrzése"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s \"%s\"-ból"
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Nem találtam digitális aláírást"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Jó digitális aláírás \"%s\"-tól"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Jó digitális aláírás"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Az aláírás készült %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "ROSSZ digitális aláírás \"%s\"-tól"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "ROSSZ digitális aláírás"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nincs publikus kulcs az aláírás ellenőrzéséhez"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH nem elérhető\n"
@@ -5825,258 +5783,258 @@ msgstr "Db"
 msgid "Creating summary view...\n"
 msgstr "Áttekintő nézet létrehozása...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Maradt még néhány kijelölt. Feldolgozzam?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan üzenet"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Nem találtam olvasatlan üzenetet. Keresés a végéről?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Nincs olvasatlan üzenet.."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem találtam olvasatlan üzenetet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Keresés ismét"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Nincs több új üzenet"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Nem találtam új üzenetet. Keresés a végéről?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Nem találtam új üzenetet. Menjek a következő mappára?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt üzenet"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Nem találtam kijelölt üzenetet. Keresés a végéről?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem találtam kijelölt üzenetet. Keresés az elejéről?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett üzenet."
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem találtam címkézett üzenetet. Keresés a végéről?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem találtam címkézett üzenetet. Keresés az elejéről?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " darab kiválasztva"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg töröljem az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s-ba mozgatásra\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s-ba másolásra\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 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:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Minden üzenet kijelölése..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Hiba az E-mail feldolgozása közben."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Üzenetfolyam lebontás végrehajtáshoz..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s fájl már létezik\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Szövegnézet létrehozása...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "egy üzenet fogadása nem sikerült\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "E rész elmentéséhez nyisd meg a helyzetfüggő menüt a "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "a jobb egérgombbal és válaszd a `Mentés másként...' menüpontot, "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6084,11 +6042,11 @@ msgstr ""
 "vagy nyomd meg az `Y'-gombot.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Szövegként való megjelenítéshez, válaszd a "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6096,37 +6054,37 @@ msgstr ""
 "`Megjelenítés szövegként', vagy `T'-gomb.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "E rész külső programmal való megnyitásához válaszd a "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Megnyit' vagy `Megnyit mint...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "vagy dupla klikk, vagy nyomd meg a középső egérgombot, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "vagy `L' gomb."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Ez a digitális aláírás még nincs ellenőrizve.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Az ellenőrzéshez nyisd meg a helyzetfüggő menüt a\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr ""
 "jobb egérgombbal és válaszd a `Digitális aláírás ellenőrzése' menüpontot!\n"
 "\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6159,6 +6117,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
 
+#~ msgid "OK"
+#~ msgstr "Rendben"
+
+#~ msgid "Close"
+#~ msgstr "Bezárás"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid "No"
+#~ msgstr "Nem"
+
+#~ msgid "Refresh"
+#~ msgstr "Frissítés"
+
+#~ msgid "Search"
+#~ msgstr "Keresés"
+
+#~ msgid "Apply"
+#~ msgstr "Alkalmaz"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Hopp: a digitális aláírás nem ellenőrzött"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Eltérő eredmények az aláíráshoz"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Hiba: ismeretlen állapot"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                azaz \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Kulcs ujjlenyomat: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "A talált címke: %s\n"
 
diff --git a/po/it.po b/po/it.po
index d4052a1b..4e534576 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta2\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-11-13 11:30+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Ok"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
@@ -116,11 +100,11 @@ msgstr ""
 "tutti»."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -132,30 +116,30 @@ msgstr "Protocollo"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr " Modifica "
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Elimina "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Giù"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Su"
@@ -164,13 +148,6 @@ msgstr "Su"
 msgid " Set as default account "
 msgstr " Imposta come account predefinito "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Chiudi"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Elimina account"
@@ -179,24 +156,15 @@ msgstr "Elimina account"
 msgid "Do you really want to delete this account?"
 msgstr "Eliminare questo account?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sì"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+No"
 
@@ -242,29 +210,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Avvio: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminato: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Azione di input/output"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Invia "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Interrompi"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -275,11 +243,11 @@ msgstr ""
 "(«%%h» verrà sostituito con l'argomento)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Argomento nascosto dell'azione utente"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -290,7 +258,7 @@ msgstr ""
 "(«%%u» verrà sostituito con l'argomento)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Argomento dell'azione utente"
 
@@ -298,13 +266,13 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Note"
 
@@ -312,24 +280,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_File"
@@ -350,8 +301,8 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_File/_Nuovo server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -369,7 +320,7 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
@@ -401,7 +352,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -410,12 +361,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -432,7 +383,7 @@ msgstr "/Nuovo _gruppo"
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -442,7 +393,7 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Modifica"
@@ -455,18 +406,18 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nome:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Elimina"
 
@@ -495,18 +446,6 @@ msgstr "Elimina l'indirizzo(i)"
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "No"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -625,7 +564,7 @@ msgstr "Errore di conversione della rubrica"
 msgid "Addressbook Conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interfaccia"
 
@@ -669,351 +608,351 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Errore"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Creazione della finestra di dialogo dell'allarme...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Mostra questo messaggio la prossima volta"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Arancio"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rosso"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Blu cielo"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Blu"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Marrone"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Modifica/A_vanzato"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Modifica/A_vanzato/Un carattere indietro"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Modifica/A_vanzato/Un carattere avanti"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Modifica/A_vanzato/Una parola indietro"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Modifica/A_vanzato/Una parola avanti"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Modifica/A_vanzato/Inizio riga"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Modifica/A_vanzato/Fine riga"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Modifica/A_vanzato/Riga precedente"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Modifica/A_vanzato/Riga successiva"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Modifica/A_vanzato/Elimina carattere indietro"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Modifica/A_vanzato/Elimina carattere avanti"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Modifica/A_vanzato/Elimina parola indietro"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Modifica/A_vanzato/Elimina parola avanti"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Modifica/A_vanzato/Elimina riga"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Modifica/A_vanzato/Elimina fino al termine riga"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/_Cifratura PGP"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio %s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Composizione messaggio %s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1021,28 +960,28 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Impossibile trovare qualsiasi chiave associata con l'id chiave «%s» "
 "attualmente selezionato."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1053,138 +992,138 @@ msgstr ""
 "%s a %s.\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "impossibile scrivere le intestazioni\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Allega il file"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1195,66 +1134,66 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Group id del processo terminato: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "File temporaneo: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da un processo di controllo\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Impossibile eseguire l'editor esterno\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Impossibile scrivere sul file\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Lettura dalla pipe fallita\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Scarta il messaggio"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Questo messaggio è stato modificato. Scartarlo?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Scarta"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "nella cartella «Bozze»"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Sostituisci"
 
@@ -1262,77 +1201,76 @@ msgstr "Sostituisci"
 msgid "Edit address"
 msgstr "Modifica l'indirizzo"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Aggiunta di una nuova persona"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Modifica dei dettagli della persona"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Deve essere fornito un indirizzo e-mail."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Devono essere forniti un nome e un valore."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Modifica i dati della persona"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Ultimo nome"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Primo nome"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Nick"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Sposta su"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Sposta giù"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valore"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Dati essenziali"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Attibuti user"
 
@@ -1348,7 +1286,7 @@ msgstr "Il file non sembra essere un formato valido della rubrica."
 msgid "Could not read file."
 msgstr "Impossibile leggere il file."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Modifica la rubrica"
 
@@ -1361,7 +1299,7 @@ msgstr " Controllo file "
 msgid "File"
 msgstr "File"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Aggiunta di una nuova rubrica"
 
@@ -1393,33 +1331,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Indirizzi disponibili"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Sposta gli indirizzi di e-mail da o in un gruppo con i pulsanti freccia"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Modifica i dettagli del gruppo"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Aggiunta di un nuovo gruppo"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Modifica la cartella"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -1431,11 +1369,11 @@ msgstr "Il file non sembra essere in formato JPilot."
 msgid "Select JPilot File"
 msgstr "Seleziona il file JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1444,7 +1382,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Voce(i) addizionale dell'indirizzo e-mail"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Aggiunta di una nuova voce JPilot"
 
@@ -1452,63 +1390,63 @@ msgstr "Aggiunta di una nuova voce JPilot"
 msgid "Connected successfully to server"
 msgstr "Connesso al sever con successo"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Impossibile connettersi al server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Modifica il server LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Nome dell'host"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Porta"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Controllo server "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Ricerca base"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Criteri di ricerca"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Reimposta "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind Password"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (secondi)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Essenziale"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Esteso"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Aggiunta di un nuovo server LDAP"
 
@@ -1520,7 +1458,7 @@ msgstr "Modifica LDAP - Seleziona la ricerca base"
 msgid "Available Search Base(s)"
 msgstr "Ricerca base(i) disponibile"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Impossibile leggere la ricerca base(i) dal server - impostarla manualmente"
@@ -1533,11 +1471,11 @@ msgstr "Il file non sembra essere in formato VCard."
 msgid "Select vCard File"
 msgstr "Selezione del file VCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Modifica la voce vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Aggiunta di una nuova voce vCard"
 
@@ -1566,10 +1504,10 @@ msgstr " Seleziona... "
 msgid "Select exporting file"
 msgstr "Seleziona il file da esportare"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
 
@@ -1577,41 +1515,41 @@ msgstr "la scrittura della configurazione sul file è fallita\n"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -1672,64 +1610,64 @@ msgstr "Non letti"
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Sto ricostruendo tutti gli alberi della cartella..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1739,16 +1677,16 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1757,24 +1695,24 @@ msgstr ""
 "Tutte le cartelle e i messaggi all'interno di «%s» saranno eliminati.\n"
 "Eliminare?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1783,34 +1721,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -1842,10 +1780,6 @@ msgstr "Messaggi"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Rinfresca"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderato"
@@ -1858,15 +1792,15 @@ msgstr "sola lettura"
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Fatto."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "ricevuti %d newsgroup (%s letti)"
@@ -1883,11 +1817,11 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -2120,7 +2054,7 @@ msgstr "Nome dell'attributo"
 msgid "Attribute"
 msgstr "Attibuto"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Seleziona"
 
@@ -2144,7 +2078,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Successivo"
 
@@ -2160,133 +2094,133 @@ msgstr "Attibuti"
 msgid "Finish"
 msgstr "Fine"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2295,27 +2229,27 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Errore del socket."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2324,11 +2258,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2337,15 +2271,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -2363,7 +2297,7 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2372,11 +2306,11 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non è supportato da glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2384,16 +2318,16 @@ msgstr ""
 "GnuPG non è installato correttamente, o questa versione è troppo vecchia.\n"
 "Il supporto per OpenPGP è disabilitato."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2403,23 +2337,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2427,40 +2361,40 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Configurazione delle azioni"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3095,58 +3029,58 @@ msgstr "/A_iuto/_FAQ/_Italiano"
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3156,16 +3090,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3175,141 +3109,141 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3411,10 +3345,6 @@ msgstr "Maiuscole/minuscole"
 msgid "Backward search"
 msgstr "Ricerca all'indietro"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Ricerca"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Ricerca fallita"
@@ -3439,28 +3369,28 @@ msgstr "Ricerca terminata"
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Salva come"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Sovrascrivere"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Sovrascrivere il file esistente?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3469,7 +3399,7 @@ msgstr ""
 "Inserire la riga di comando per la stampa:\n"
 "(«%s» verrà sostituito col nome del file)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3529,7 +3459,7 @@ msgstr "Creazione della vista MIME...\n"
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Testo"
 
@@ -3541,15 +3471,15 @@ msgstr "Allegati"
 msgid "Select \"Check signature\" to check"
 msgstr "Seleziona «Controlla firma» per controllare"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Impossibile salvare parte del messaggio composto."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Apri con"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3558,7 +3488,7 @@ msgstr ""
 "Inserire la riga di comando per aprire il file:\n"
 "(«%s» verrà sostituito col nome del file)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "La riga di comando del visualizzatore MIME non è valida: «%s»"
@@ -3663,15 +3593,15 @@ 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"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[nessun user id]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3684,7 +3614,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3692,70 +3622,66 @@ msgstr ""
 "Passphrase sbagliata! Provare ancora...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nel saluto non è stata trovata la necessaria data/ora APOP\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Errore di sintassi nella data/ora del saluto\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Errore nel protocollo POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "risposta UIDL non valida: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Eliminazione del messaggio scaduto %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Salto il messaggio %d (%d byte)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "la casella postale è bloccata\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "timeout della sessione \n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "impossibile avviare la sessione TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "si è verificato un errore durante l'autenticazione\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "comando non supportato\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Trovato %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Applica"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
@@ -3777,11 +3703,11 @@ msgstr "Preferenze dell'account"
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3891,7 +3817,7 @@ msgstr "Scarica tutti i messaggi sul server"
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3911,7 +3837,7 @@ msgstr "(I messaggi non filtrati saranno memorizzati in questa cartella)"
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -3919,7 +3845,7 @@ msgstr "Automatico"
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Intestazione"
 
@@ -3935,7 +3861,7 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4130,19 +4056,19 @@ msgstr ""
 "per i messaggi cifrati. Non è compatibile con\n"
 "RFC 3156 - Sicurezza MIME con OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Configurazione delle azioni"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nome del menù:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Riga di comando:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4183,43 +4109,43 @@ msgstr ""
 "   %h per l'argomento nascosto fornito dall'utente\n"
 "   %s per la selezione del testo"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Sostituisci "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Aiuto sintassi "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Azioni registrate"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nuovo)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Il nome del menù non è impostato."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "I due punti «:» non sono ammessi nel nome del menù."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Il nome del menù è troppo lungo."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "La riga di comando non è impostata."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Il nome del menù e il comando sono troppo lunghi."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4230,91 +4156,91 @@ msgstr ""
 "%s\n"
 "ha un errore di sintassi."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Elimina l'azione"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Eliminare questa azione?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Creazione della finestra delle preferenze comuni...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferenze comuni"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Cita"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Altro"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Programma esterno"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Usa un programma esterno per incorporare la posta"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Spool locale"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorpora dallo spool"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtra quando incorpori"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Percorso dello spool"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Controllo automatico nuova posta"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "ogni"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuto(i)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Controlla se c'è nuova posta all'avvio"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4322,115 +4248,115 @@ msgstr ""
 "Massimo numero di articoli da scaricare\n"
 "(0 significa illimitato)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Usa il programma esterno per l'invio"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Salva i messaggi inviati nella cartella «Inviata»"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Codifica usata in uscita"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatica (Raccomandata)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII a 7 bit (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Occidentale (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Centrale (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4438,11 +4364,11 @@ msgstr ""
 "Selezionando «Automatico» verrà usata la codifica\n"
 "ottimale per la località attuale."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Codifica di trasferimento"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4450,115 +4376,115 @@ msgstr ""
 "Specificare il contenuto della codifica di trasferimento usata\n"
 "quando il corpo del messaggio contiene dei caratteri non-ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Separatore della firma"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Inserisci automaticamente"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Lancia automaticamente l'editor esterno"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Livello di annulla"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Vai a capo nei messaggi dopo"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caratteri"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "A capo nella citazione"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "A capo durante l'input"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "A capo prima dell'invio"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Seleziona automaticamente l'account per le risposte"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Cita il messaggio quando rispondi"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formato della risposta"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formato di inoltro"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Descrizione dei simboli "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Carattere"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduci il nome dell'intestazione (come «Da:», «Oggetto:»)"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup più lunghi di"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "lettere"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4566,63 +4492,63 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4630,36 +4556,36 @@ msgstr ""
 "(Impostando a «0» si conserverà la passphrase\n"
 "per l'intera sessione)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Apri il primo messaggio non letto quando entri in una cartella"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Segna il messaggio come letto solo quando è aperto in una nuova finestra"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4667,217 +4593,217 @@ msgstr ""
 "(I messaggi verranno solo segnati fino all'esecuzione\n"
 "se questa è inattiva)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4901,11 +4827,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4919,7 +4845,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4931,15 +4857,15 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Selezione del carattere"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4949,31 +4875,31 @@ msgstr ""
 "Si può anche modificare ognuno dei tasti scorciatoia del menù premendo\n"
 "un(dei) tasto(i) quando il puntatore del mouse è sulla voce del menù."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Impostazione dell'intestazione personalizzata"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Intestazioni personalizzate"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Il nome dell'intestazione non è impostato."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Elimina l'intestazione"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Eliminare questa intestazione?"
 
@@ -4981,143 +4907,143 @@ msgstr "Eliminare questa intestazione?"
 msgid "Creating display header setting window...\n"
 msgstr "Creazione della finestra di impostazione dell'intestazione...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Mostra l'impostazione dell'intestazione"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Nome dell'intestazione"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Intestazioni visualizzate"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Intestazioni nascoste"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Mostra tutte le intestazioni non specificate"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Lettura della configurazione delle intestazioni visualizzate...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Scrittura della configurazione delle intestazioni visualizzate...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Questa intestazione è già nella lista."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Impostazione dei filtri"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "In alto"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "In basso"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Copia"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Elimina la regola"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Eliminare questa regola?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Regola del filtro"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Se qualcuna delle seguenti condizioni corrisponde"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Se tutte le seguenti condizioni corrispondono"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Eseguire le seguenti azioni:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "A o Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Qualsiasi intestazione"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Modifica intestazione..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Corpo messaggio"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Risultato del comando"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Età"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "non contiene"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "è"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "non è"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "corrisponde alla esp.reg."
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "non corrisponde alla esp. reg."
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "è più grande di"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "è più piccolo di"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "è più lungo di"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "è più corto di"
 
@@ -5165,23 +5091,23 @@ msgstr "Esegui comando"
 msgid "Stop rule evaluation"
 msgstr "Ferma valutazione regola"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "cartella:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "indirizzo:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Modifica lista intestazione"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Intestazioni"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Intestazione:"
 
@@ -5347,7 +5273,7 @@ msgstr "Elimina il modello"
 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
@@ -5370,11 +5296,11 @@ msgstr "L'invio del messaggio accodato %d è fallito.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Stato"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Creazione della finestra di avanzamento...\n"
 
@@ -5386,97 +5312,66 @@ msgstr "si è verificato un errore durante il recupero dei dati.\n"
 msgid "Can't write to file.\n"
 msgstr "Impossibile scrivere sul file.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Firma non verificata"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Firma non trovata"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Firma corretta"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "Firma DIFETTOSA"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nessuna chiave pubblica per verificare la firma"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Errore verificando la firma"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Risultati differenti per le firme"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Errore: Stato sconosciuto"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Firma valida da «%s»"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Firma DIFETTOSA da «%s»"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Impossibile trovare lo user ID per questa chiave."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                alias «%s»\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Firma fatta a %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Impronta digitale della chiave: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Errore verificando la firma"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Seleziona la chiave per «%s»"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Raccolta delle informazioni per «%s» ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Selezione delle chiavi"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID chiave"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Valore"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Aggiungi una chiave"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Immettere un altro user o chiave ID:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "L'intestazione del messaggio accodato è rovinata.\n"
@@ -5564,15 +5459,78 @@ msgstr ""
 "avendone una.\n"
 "In caso di dubbio seleziona semplicemente OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Controllo della firma"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s da «%s»"
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Firma non trovata"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Firma valida da «%s»"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Firma corretta"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Firma fatta a %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Firma DIFETTOSA da «%s»"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "Firma DIFETTOSA"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nessuna chiave pubblica per verificare la firma"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH non disponibile\n"
@@ -5775,257 +5733,257 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "Creazione della vista del sommario...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Segno del processo"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Ricerca ancora"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Selezione di tutti i messaggi..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Senza thread in esecuzione..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "il file %s esiste già\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Creazione della vista del testo...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Per salvare questa parte, aprire il menù contestuale "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "cliccando con il tasto destro e selezionare «Salva come...», "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6033,11 +5991,11 @@ msgstr ""
 "o premere il tasto «y».\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Per mostrare questa parte come testo, selezionare "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6045,35 +6003,35 @@ msgstr ""
 "«Mostra come testo», o premere il tasto «t».\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Per aprire questa parte con un programma esterno, selezionare "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "«Apri» o «Apri con...», "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "o fare doppio click, o cliccare col pulsante centrale, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "o premere il tasto «l»."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Questa firma non è stata ancora controllata.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Per controllarla, aprire il menù contestuale cliccando con\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "il tasto destro e selezionare «Controlla firma».\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6109,6 +6067,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
 
+#~ msgid "OK"
+#~ msgstr "Ok"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Refresh"
+#~ msgstr "Rinfresca"
+
+#~ msgid "Search"
+#~ msgstr "Ricerca"
+
+#~ msgid "Apply"
+#~ msgstr "Applica"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Firma non verificata"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Risultati differenti per le firme"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Errore: Stato sconosciuto"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                alias «%s»\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Impronta digitale della chiave: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Trovata l'etichetta: %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index e30db834..aca95ac2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -64,22 +64,6 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "すべてのアカウント毎の設定を読み込み中...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "名前"
 
@@ -129,30 +113,30 @@ msgstr "プロトコル"
 msgid "Server"
 msgstr "サーバ"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "追加"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "編集"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "  削除  "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "  ↓  "
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "  ↑  "
@@ -161,13 +145,6 @@ msgstr "  ↑  "
 msgid " Set as default account "
 msgstr " 通常使用するアカウントに指定 "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "閉じる"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "アカウントの削除"
@@ -176,24 +153,15 @@ msgstr "アカウントの削除"
 msgid "Do you really want to delete this account?"
 msgstr "本当にこのアカウントを削除してもいいですか?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "はい"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+いいえ"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 実行中: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 終了: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "アクションの入出力"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " 送信 "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "中断"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,11 +240,11 @@ msgstr ""
 "(`%%h' は引数で置き換えられます)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "アクションの不可視ユーザ引数"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "(`%%u' は引数で置き換えられます)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "アクションのユーザ引数"
 
@@ -295,13 +263,13 @@ msgstr "アクションのユーザ引数"
 msgid "Add Address to Book"
 msgstr "アドレスをアドレス帳に追加"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "アドレス"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "備考"
 
@@ -309,24 +277,7 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/ファイル(_F)"
@@ -347,8 +298,8 @@ msgstr "/ファイル(_F)/新規_JPilot"
 msgid "/_File/New _Server"
 msgstr "/ファイル(_F)/新規サーバ(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -366,7 +317,7 @@ msgstr "/ファイル(_F)/削除(_D)"
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
@@ -398,7 +349,7 @@ msgstr "/アドレス(_A)/編集(_E)"
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/ツール(_T)"
@@ -407,12 +358,12 @@ msgstr "/ツール(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
@@ -429,7 +380,7 @@ msgstr "/新規グループ(_G)"
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/編集(_E)"
@@ -452,18 +403,18 @@ msgstr "/削除(_D)"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "名前:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "削除"
 
@@ -492,18 +443,6 @@ msgstr "アドレスの削除"
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "いいえ"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -619,7 +558,7 @@ msgstr "アドレス帳変換エラー"
 msgid "Addressbook Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "インタフェース"
 
@@ -663,351 +602,351 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "エラー"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "警告パネルダイアログを作成中...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "次回もこのメッセージを表示する"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "オレンジ"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "赤"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "ピンク"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "空色"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "青"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "緑"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "茶"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "なし"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/追加(_A)..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/ファイル(_F)/送信(_S)"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/ファイル(_F)/後で送信(_L)"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/ファイル(_F)/草稿フォルダに保存(_D)"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/ファイル(_F)/保存して編集を続ける(_K)"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/ファイル(_F)/ファイルを添付(_A)"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/ファイル(_F)/ファイルを挿入(_I)"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/ファイル(_F)/署名を挿入(_G)"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/編集(_E)/元に戻す(_U)"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/編集(_E)/やり直し(_R)"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/編集(_E)/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/編集(_E)/カット(_T)"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編集(_E)/引用としてペースト(_Q)"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/編集(_E)/すべて選択(_A)"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/編集(_E)/高度な操作(_D)"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/編集(_E)/高度な操作(_D)/1文字戻る"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/編集(_E)/高度な操作(_D)/1文字進む"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/編集(_E)/高度な操作(_D)/1単語戻る"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/編集(_E)/高度な操作(_D)/1単語進む"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/編集(_E)/高度な操作(_D)/行頭に移動"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/編集(_E)/高度な操作(_D)/行末に移動"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/編集(_E)/高度な操作(_D)/前の行に移動"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/編集(_E)/高度な操作(_D)/次の行に移動"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/編集(_E)/高度な操作(_D)/後ろの1文字を削除"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/編集(_E)/高度な操作(_D)/次の1文字を削除"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/編集(_E)/高度な操作(_D)/後ろの1単語を削除"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/編集(_E)/高度な操作(_D)/次の1単語を削除"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/編集(_E)/高度な操作(_D)/行削除"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/編集(_E)/高度な操作(_D)/行末までを削除"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編集(_E)/現在の段落を整形する(_W)"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編集(_E)/すべての長い行を折り返す(_L)"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/表示(_V)"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/表示(_V)/宛先(_T)"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/表示(_V)/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/表示(_V)/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/表示(_V)/返信先を指定(_R)"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/表示(_V)/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/表示(_V)/フォロー先を指定(_F)"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/表示(_V)/ルーラ(_U)"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/表示(_V)/添付(_A)"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/ツール(_T)/アドレス帳(_A)"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/ツール(_T)/テンプレート(_T)"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/ツール(_T)/アクション(_N)"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/ツール(_T)/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/ツール(_T)/外部エディタで編集(_X)"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/ツール(_T)/PGP署名(_G)"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/ツール(_T)/PGP暗号化(_E)"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ファイルが存在しません\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "テキストパートを取得できません\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "引用符の書式が不正です。"
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "メッセージの返信/転送の書式が不正です。"
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "ファイル %s は存在しません\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "%s を読み込めません。"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "メッセージ: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [更新]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - メッセージの作成%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "メッセージの作成%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "宛先が指定されていません。"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "送信"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "件名が空です。とにかく送信しますか?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1015,26 +954,26 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1045,138 +984,138 @@ msgstr ""
 "%s から %s に変換できません。\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "ヘッダを書き込めません。\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME タイプ"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "差出人:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "メッセージを送信"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "後で送信"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "送信待ちフォルダに入れて後で送信"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "草稿フォルダに保存"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "挿入"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "ファイルを挿入"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "添付"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "ファイルを添付"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "署名"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "署名を挿入"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "外部エディタで編集"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "整形"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1187,66 +1126,66 @@ msgstr ""
 "プロセスを強制終了しますか?\n"
 "プロセスグループID: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "終了したプロセスグループID: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "一時ファイル: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: 監視プロセスからの入力\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "外部エディタを実行できません\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "ファイルに書き込めません\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "パイプの読み込みに失敗\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "メッセージの破棄"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "このメッセージは変更されています。破棄しますか?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "破棄"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "草稿へ"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "置換"
 
@@ -1254,77 +1193,76 @@ msgstr "置換"
 msgid "Edit address"
 msgstr "アドレスを編集"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "新しい人物を追加"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "人物の詳細を編集"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "メールアドレスを指定する必要があります。"
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "名前と値を指定する必要があります。"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "人物のデータを編集"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "表示名"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "ニックネーム"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "電子メール アドレス"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "別名"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "上に移動"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "下に移動"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "変更"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "クリア"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "内容"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "基本データ"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "ユーザの属性"
 
@@ -1340,7 +1278,7 @@ msgstr "ファイルは有効なアドレス帳フォーマットではないよ
 msgid "Could not read file."
 msgstr "ファイルを読み込めません。"
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "アドレス帳の編集"
 
@@ -1353,7 +1291,7 @@ msgstr " ファイルをチェック "
 msgid "File"
 msgstr "ファイル"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "新規アドレス帳を追加"
 
@@ -1385,32 +1323,32 @@ msgstr " ← "
 msgid "Available Addresses"
 msgstr "利用可能なアドレス"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "矢印ボタンで電子メールアドレスをグループに(から)移動"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "グループの詳細の編集"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "新規グループの追加"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "フォルダの編集"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -1422,11 +1360,11 @@ msgstr "ファイルはJPilot形式ではないようです。"
 msgid "Select JPilot File"
 msgstr "JPilotファイルを選択"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "JPilotエントリを編集"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1435,7 +1373,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "追加の電子メールアドレスの項目"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "新規JPilotエントリを追加"
 
@@ -1443,63 +1381,63 @@ msgstr "新規JPilotエントリを追加"
 msgid "Connected successfully to server"
 msgstr "サーバとの接続に成功しました"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "サーバに接続できません"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "LDAPサーバを編集"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "ポート"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " サーバをチェック "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "検索ベース"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "検索基準"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " リセット "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "DNをバインド"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "パスワードをバインド"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "タイムアウト(秒)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "最大エントリ数"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "拡張"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "新規LDAPサーバを追加"
 
@@ -1511,7 +1449,7 @@ msgstr "LDAPの編集 - 検索ベースを選択"
 msgid "Available Search Base(s)"
 msgstr "利用可能な検索ベース"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "サーバから検索ベースを読み込めません - 手動で指定してください"
 
@@ -1523,11 +1461,11 @@ msgstr "ファイルはvCard形式ではないようです。"
 msgid "Select vCard File"
 msgstr "vCardファイルの選択"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "vCardエントリの編集"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "新規vCardエントリの追加"
 
@@ -1556,10 +1494,10 @@ msgstr " 選択... "
 msgid "Select exporting file"
 msgstr "エクスポートするファイルを選択"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "設定のファイルへの書き込みに失敗しました\n"
 
@@ -1567,41 +1505,41 @@ msgstr "設定のファイルへの書き込みに失敗しました\n"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
@@ -1662,64 +1600,64 @@ msgstr "未読"
 msgid "#"
 msgstr "総数"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "全フォルダツリーを再構築中..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1729,16 +1667,16 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1747,24 +1685,24 @@ msgstr ""
 "`%s' 以下のフォルダとメッセージはすべて削除されます。\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "フォルダ `%s' を削除できません。"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1773,34 +1711,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -1832,10 +1770,6 @@ msgstr "メッセージ"
 msgid "Type"
 msgstr "タイプ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "更新"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "モデレート"
@@ -1848,15 +1782,15 @@ msgstr "購読のみ"
 msgid "unknown"
 msgstr "不明"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "ニュースグループリストを取得できません。"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "完了."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d ニュースグループを受信 (%s 受信)"
@@ -1873,11 +1807,11 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(差出人不明)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -2110,7 +2044,7 @@ msgstr "属性名"
 msgid "Attribute"
 msgstr "属性"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "選択"
 
@@ -2134,7 +2068,7 @@ msgstr "LDIFファイルをアドレス帳へインポート"
 msgid "Prev"
 msgstr "前へ"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "次へ"
 
@@ -2150,133 +2084,133 @@ msgstr "属性"
 msgid "Finish"
 msgstr "完了"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "新着メッセージを受信中"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "待機中"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "キャンセル"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "受信中"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完了 (%d 通 (%s) 受信)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "認証失敗"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "ロック中"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完了 (%d 通の新着メッセージ)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "完了 (新着メッセージなし)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "メールの取得中にエラーが発生しました。"
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "アカウント %s の新着メッセージを取り込んでいます...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 新着メッセージを受信中"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3サーバ: %s に接続中..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3サーバ: %s:%d に接続できません\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "認証中..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s からメッセージを受信中..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "新着メッセージの数を取得中 (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "新着メッセージの数を取得中 (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "新着メッセージの数を取得中 (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "メッセージのサイズを取得中 (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "メッセージ %d を削除中"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "切断中"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "受信中 (%d 通 (%s) 受信)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "接続に失敗しました。"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "メールの処理中にエラーが発生しました。"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2285,27 +2219,27 @@ msgstr ""
 "メールの処理中にエラーが発生しました:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "ディスクの空き容量がありません。"
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "ファイルに書き込めません。"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "ソケットエラーです。"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "リモートホストによって接続を切断されました。"
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "メールボックスはロックされています。"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2314,11 +2248,11 @@ msgstr ""
 "メールボックスはロックされています:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2327,15 +2261,15 @@ msgstr ""
 "認証に失敗しました:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "セッションがタイムアウトしました。"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "受信をキャンセルしました\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "新しいメッセージを %s から %s に取り込んでいます...\n"
@@ -2353,7 +2287,7 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2362,11 +2296,11 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread は glib によってサポートされていません。\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2374,16 +2308,16 @@ msgstr ""
 "GnuPG が正しくインストールされていないか、バージョンが古すぎます。\n"
 "OpenPGP サポートは無効です。"
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用法: %s [オプション]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    メッセージ作成ウィンドウを開く"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2393,23 +2327,23 @@ msgstr ""
 "                         指定したファイルを添付してメッセージ作成\n"
 "                         ウィンドウを開く"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              新着メッセージを受信する"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          全アカウントの新着メッセージを受信する"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送信待機中のメッセージをすべて送信する"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   メッセージの総数を表示する"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2417,39 +2351,39 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         各フォルダの状態を表示する"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                デバッグモード"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 このヘルプを表示して終了する"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              バージョン情報を出力して終了する"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "作成中のメッセージが存在します。本当に終了しますか?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "送信待機中のメッセージ"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:695
+#: src/main.c:717
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3086,56 +3020,56 @@ msgstr "/ヘルプ(_H)/_FAQ/イタリア語(_I)"
 msgid "/_Help/---"
 msgstr "/ヘルプ(_H)/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "メインウィンドウを作成中...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "名称未設定"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "なし"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "ウィンドウの分離タイプを %d から %d に変更しています\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "現在オフラインです。オンラインにしますか?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "すべてのごみ箱を空にする"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "すべてのごみ箱の中のメッセージを削除しますか?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "メールボックスを追加"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3144,16 +3078,16 @@ msgstr ""
 "メールボックスの位置を入力してください。\n"
 "既存のメールボックスを指定すると自動的にスキャンします。"
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3162,141 +3096,141 @@ msgstr ""
 "メールボックスの作成に失敗しました。\n"
 "いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - フォルダビュー"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/全員に返信(_A)"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/差出人に返信(_S)"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "受信"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "新着メールの取込"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "全受信"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "全アカウントの新着メールの取込"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "送信待機中のメッセージを送信する"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "作成"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "新規メッセージの作成"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "返信"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "メッセージに返信する"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "全員に返信"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "転送"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "メッセージを転送する"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "メッセージを削除する"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "実行"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "マークされた処理を実行"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "次の未読メッセージ"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "アカウント"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "アカウントの設定"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "現在オフラインです。アイコンをクリックするとオンラインになります。"
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "現在オンラインです。アイコンをクリックするとオフラインになります。"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "終了"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "このプログラムを終了しますか?"
 
@@ -3398,10 +3332,6 @@ msgstr "大文字/小文字を区別"
 msgid "Backward search"
 msgstr "後方検索"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "検索"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "検索失敗"
@@ -3426,28 +3356,28 @@ msgstr "検索完了"
 msgid "Creating message view...\n"
 msgstr "メッセージビューを作成中...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "名前を付けて保存"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "上書き"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "既存のファイルを上書きしますか?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3456,7 +3386,7 @@ msgstr ""
 "印刷コマンドを入力してください:\n"
 "(`%s' はファイル名で置き換えられます)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3516,7 +3446,7 @@ msgstr "MIME ビューを作成中...\n"
 msgid "MIME Type"
 msgstr "MIME タイプ"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "テキスト"
 
@@ -3528,15 +3458,15 @@ msgstr "添付"
 msgid "Select \"Check signature\" to check"
 msgstr "検証するには、 \"署名を検証\" を選択してください"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "マルチパートメッセージのパートを保存できません。"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "アプリケーションから開く"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3545,7 +3475,7 @@ msgstr ""
 "ファイルを開くコマンドを入力してください:\n"
 "(`%s' はファイル名で置き換えられます)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME ビューアのコマンドラインが無効です: `%s'"
@@ -3650,15 +3580,15 @@ msgstr "ポスト中にエラーが発生しました\n"
 msgid "Error occurred while sending command\n"
 msgstr "コマンドの送信中にエラーが発生しました\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[ユーザIDなし]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3671,7 +3601,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3679,70 +3609,66 @@ msgstr ""
 "不正なパスフレーズです! 再入力して下さい...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "必要なAPOPタイムスタンプが応答メッセージにありません\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "応答メッセージのタイムスタンプの文法エラー\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 プロトコルエラー\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無効な UIDL 応答です: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 期限切れのメッセージ %d を削除します\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: メッセージ %d をスキップします (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "メールボックスはロックされています\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "セッションがタイムアウトしました\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "TLS セッションを開始できません\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "認証中にエラーが発生しました\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "コマンドがサポートされていません\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 セッション中にエラーが発生しました\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "%s が見つかりました\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "適用"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを開いています...\n"
@@ -3764,11 +3690,11 @@ msgstr "アカウントの設定"
 msgid "Creating account preferences window...\n"
 msgstr "アカウントプリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "受信"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "個人情報"
 
@@ -3877,7 +3803,7 @@ msgstr "サーバ上のすべてのメッセージを受信する"
 msgid "Receive size limit"
 msgstr "受信サイズ制限"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3897,7 +3823,7 @@ msgstr "(振り分けされないメッセージはこのフォルダに格納�
 msgid "Authentication method"
 msgstr "認証方式"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "自動"
 
@@ -3905,7 +3831,7 @@ msgstr "自動"
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全受信」でこのアカウントの新着メッセージをチェックする"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "ヘッダ"
 
@@ -3921,7 +3847,7 @@ msgstr "メッセージIDを生成する"
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " 編集... "
 
@@ -4116,19 +4042,19 @@ msgstr ""
 "いません。この形式は RFC 3156 - MIME Security with OpenPGP\n"
 "に準拠していません。"
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "アクションの設定"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "メニュー名:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "コマンドライン:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4168,43 +4094,43 @@ msgstr ""
 "   %h ユーザが指定した不可視引数\n"
 "   %s 選択文字列"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " 置換 "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " 文法のヘルプ "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "登録済みアクション"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(新規)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "メニュー名が指定されていません。"
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "コロン ':' はメニュー名には使えません。"
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "メニュー名が長すぎます。"
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "コマンドラインが指定されていません。"
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "メニュー名とコマンドラインが長すぎます。"
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4215,91 +4141,91 @@ msgstr ""
 "%s\n"
 "に文法の誤りがあります。"
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "アクションの削除"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "本当にこのアクションを削除してもいいですか?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "全般プリファレンスウィンドウを作成中...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "全般の設定"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "引用"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "表示"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "その他"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "外部プログラム"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "メールの受信に外部プログラムを使用する"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "コマンド"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "ローカルスプール"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "スプールから取り込む"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "取込時に振り分ける"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "スプールのパス"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "新着メールを自動チェックする"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr " "
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "分ごと"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "起動時に新着メールをチェックする"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "受信後にすべてのローカルフォルダを更新する"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "ニュース"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4307,115 +4233,115 @@ msgstr ""
 "ダウンロードする記事数の上限\n"
 "(0で無制限)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "メールの送信に外部プログラムを使用する"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "送信したメッセージを送信控に保存する"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "送信コードセット"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "自動設定 (推奨)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "欧米 (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "欧米 (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルト諸国 (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルト諸国 (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "キリル文字 (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4423,11 +4349,11 @@ msgstr ""
 "「自動設定」を選択した場合は、現在のロカールに最適な\n"
 "エンコーディングが使用されます。"
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "転送符号化方式"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4435,177 +4361,177 @@ msgstr ""
 "メッセージ本文が ASCII 文字以外を含む場合に使用する\n"
 "Content-Transfer-Encoding を指定してください。"
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "署名の区切り"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "自動的に挿入する"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "外部エディタを自動的に起動する"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "アンドゥの回数"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "メッセージを半角"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "文字で改行"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "引用部を自動整形する"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "入力時に自動整形する"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "送信時に自動整形する"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "返信時に自動的にアカウントを選択する"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "返信時にメッセージを引用する"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "返信ボタンでメーリングリストに返信する"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "返信の書式"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "引用符"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "転送の書式"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " 記号の説明 "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "フォント"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "ヘッダの項目を翻訳する (例えば `From:', `Subject:' 等)"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "フォルダ名の横に未読数を表示する"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "文字数が"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "字より長いニュースグループ名を簡略表示"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "サマリビュー"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "日付の書式"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " サマリの表示項目を設定... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "メッセージの色を有効にする"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "メッセージビューの上部にヘッダペインを表示する"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "メッセージビューに簡略ヘッダを表示する"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "行間を空ける"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "ピクセル"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "半ページ単位"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "スムーズスクロール"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "間隔"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "署名を自動的に検証する"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "署名の検証結果をポップアップウィンドウで表示する"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "パスフレーズをメモリ上に一時的に記憶する"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "有効期間"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "分"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4613,35 +4539,35 @@ msgstr ""
 "('0' に設定するとセッションの間中パスフレーズを\n"
 " 記憶します)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "パスフレーズの入力時に入力を捕捉する"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG が動作しない場合起動時に警告を表示する"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "サマリでメッセージを選択したとき常に開く"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "フォルダに入ったときに最初の未読メッセージを開く"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "新着メールを受信した後受信箱に移動する"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "メッセージを移動または削除したら即座に実行する"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4649,216 +4575,216 @@ msgstr ""
 "(これを無効にすると、メッセージは実行されるまで\n"
 " マークされた状態になります)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "受信ダイアログ"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "受信ダイアログを"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "常に表示"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "手動で受信した場合のみ表示"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "表示しない"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "受信エラー時にエラーダイアログをポップアップしない"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "完了時に受信ダイアログを閉じる"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " キーバインドを設定... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "終了時"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "終了時に確認する"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "終了時にごみ箱を空にする"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "空にする前に尋ねる"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "送信待機中のメッセージがあれば警告する"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "ソケット I/O のタイムアウト:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4882,11 +4808,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4900,7 +4826,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4912,15 +4838,15 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "フォントの選択"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4930,31 +4856,31 @@ msgstr ""
 "また、マウスポインタをメニューの項目の上に置きキーを押す\n"
 "ことで各メニューのショートカットを変更することもできます。"
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "カスタムヘッダの設定"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "カスタムヘッダ"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "ヘッダ名が指定されていません。"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "ヘッダの削除"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "本当にこのヘッダを削除してもいいですか?"
 
@@ -4962,143 +4888,143 @@ msgstr "本当にこのヘッダを削除してもいいですか?"
 msgid "Creating display header setting window...\n"
 msgstr "表示ヘッダ設定ウィンドウを作成中...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "表示ヘッダの設定"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "ヘッダ名"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "表示するヘッダ"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "表示しないヘッダ"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "指定されていないヘッダをすべて表示"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "表示ヘッダの設定を読み込み中...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "表示ヘッダの設定を書き出し中...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "このヘッダはすでにリスト中に存在します。"
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "振り分けの設定"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "有効"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "先頭"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "末尾"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "コピー"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "ルールの削除"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "本当にこのルールを削除してもいいですか?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "フィルタルール"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "次の条件のいずれかが該当する場合"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "次の条件のすべてが該当する場合"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "次のアクションを実行:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "To または Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "いずれかのヘッダ"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "ヘッダを編集..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "メッセージ本文"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "コマンドの実行結果"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "経過日数"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "が次を含む"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "が次を含まない"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "が次に一致"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "が次に一致しない"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "が次の正規表現にマッチ"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "が次の正規表現にマッチしない"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "が次より大きい"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "が次より小さい"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "が次より長い"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "が次より短い"
 
@@ -5146,23 +5072,23 @@ msgstr "コマンドを実行"
 msgid "Stop rule evaluation"
 msgstr "ルールの評価を停止"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "フォルダ:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "アドレス:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "ヘッダリストの編集"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "ヘッダ"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "ヘッダ:"
 
@@ -5327,7 +5253,7 @@ msgstr "テンプレートの削除"
 msgid "Do you really want to delete this template?"
 msgstr "本当にこのテンプレートを削除してもいいですか?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 
@@ -5350,11 +5276,11 @@ msgstr "送信待機中メッセージ %d の送信に失敗しました。\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "状態"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "進行状況ダイアログを作成中...\n"
 
@@ -5366,97 +5292,70 @@ msgstr "データの取得中にエラーが発生しました。\n"
 msgid "Can't write to file.\n"
 msgstr "ファイルに書き込めません。\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: 署名は検証されていません"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "署名がありません"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "正当な署名"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "不正な署名"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "署名を検証するための公開鍵がありません"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "署名検証エラー"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "署名に対して複数の異なった結果"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "エラー: 不明な状態"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "差出人 \"%s\" の正当な署名"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "差出人 \"%s\" の不正な署名"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "この鍵のためのユーザIDが見つかりません。"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                または \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr "\t\tまたは \"%s\"\n"
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "署名の作成時刻 %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "鍵指紋: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "署名検証エラー"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "`%s' の鍵を選択してください"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "`%s' の情報を収集しています ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "鍵の選択"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "鍵ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "正当性"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "鍵の追加"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "別のユーザまたは鍵IDを入力してください:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr "鍵の信用"
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+"選択した鍵は完全には信用されていません。\n"
+"この鍵でメッセージを暗号化することを選択した場合、\n"
+"それが目的の相手に届くかどうかは保証できません。\n"
+"とにかくこの鍵を信用して使用しますか?"
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "送信待機中のメッセージのヘッダが壊れています。\n"
@@ -5544,15 +5443,77 @@ msgstr ""
 "それを使用することが出来ます。\n"
 "よく分からない場合は、そのままOKを選択してください。"
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "署名を検証中"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s: 差出人 \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "署名がありません"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "差出人 \"%s\" の正当な署名"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "正当な署名"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr "有効な署名ですが \"%s\" の鍵は信用されていません"
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr "有効な署名 (信用されていない鍵)"
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr "署名は有効ですが \"%s\" に対する期限が切れています"
+
+#: src/sigstatus.c:237
+msgid "Signature valid but expired"
+msgstr "署名は有効ですが期限が切れています"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr "署名は有効ですが \"%s\" の署名鍵の有効期限が切れています"
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr "署名は有効ですが署名鍵の有効期限が切れています"
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr "署名は有効ですが \"%s\" の署名鍵が失効しています"
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr "署名は有効ですが署名鍵が失効しています"
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "差出人 \"%s\" の不正な署名"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "不正な署名"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "署名を検証するための公開鍵がありません"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH が利用できません\n"
@@ -5755,255 +5716,255 @@ msgstr "番号"
 msgid "Creating summary view...\n"
 msgstr "サマリビューを作成中...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "マークの処理"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "マークが残っています。処理しますか?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "未読メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "再検索"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "新着メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名で寄せています..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(日付なし)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "すべてのメッセージを選択中..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "実行のためにスレッドを解除中..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "ファイル %s はすでに存在します\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "テキストビューを作成中...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "このメッセージは表示できません。\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "このパートを保存するには、右クリックでコンテキストメニューを"
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "表示し、「名前を付けて保存...」を選択するか、"
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6011,11 +5972,11 @@ msgstr ""
 "`y' キーを押してください。\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "このパートをテキストメッセージとして表示するには、"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6023,37 +5984,37 @@ msgstr ""
 "「テキストとして表示」を選択するか、`t' キーを押してください。\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "このパートを外部プログラムで開くには、「開く」または"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "「アプリケーションから開く」を選択するか、"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "あるいはダブルクリックするか、中央ボタンをクリックするか、"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "`l' キーを押して下さい。"
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "この署名はまだ検証されていません。\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "検証するには、右クリックでコンテキストメニューを表示し、\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr ""
 "「署名を検証」を選択してください。\n"
 "\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
diff --git a/po/ko.po b/po/ko.po
index 5925cee7..488a3c44 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: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -51,22 +51,6 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "확인"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
@@ -100,11 +84,11 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "이름"
 
@@ -116,30 +100,30 @@ msgstr "프로토콜"
 msgid "Server"
 msgstr "서버"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "추가"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "편집"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "삭제"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "아래로"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "위로"
@@ -148,13 +132,6 @@ msgstr "위로"
 msgid " Set as default account "
 msgstr " 기본 계정으로 설정 "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "닫기"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "계정 삭제"
@@ -163,24 +140,15 @@ msgstr "계정 삭제"
 msgid "Do you really want to delete this account?"
 msgstr "정말로 이 계정을 삭제하시겠습니까?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "확인"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "아니요"
 
@@ -226,29 +194,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 실행중입니다: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 끝났습니다: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " 발송 "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "중지됨"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -258,11 +226,11 @@ msgstr ""
 "인쇄 명령어서 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,7 +240,7 @@ msgstr ""
 "인쇄 명령어서 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -280,13 +248,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "메모"
 
@@ -294,24 +262,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "취소"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -332,8 +283,8 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -351,7 +302,7 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
@@ -383,7 +334,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -392,12 +343,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -414,7 +365,7 @@ msgstr "/새 그룹(_G)"
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -424,7 +375,7 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/편집(_E)"
@@ -437,18 +388,18 @@ msgstr "/삭제(_D)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "주소록"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "이름:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "삭제"
 
@@ -477,18 +428,6 @@ msgstr "주소를 삭제"
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "아니오"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -599,7 +538,7 @@ msgstr "주소록 변환 에러"
 msgid "Addressbook Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "인터페이스"
 
@@ -643,360 +582,360 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "에러"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "경고 패널 다이얼로그를 생성합니다...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "다음번에 이 메시지 보기"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "오렌지색"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "적색"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "분홍색"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "하늘색"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "청색"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "녹색"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "갈색"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/편집(_E)/고급(_d)"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/편집(_E)/고급(_d)/문자를 뒤로 이동"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/편집(_E)/고급(_d)/문자를 앞으로 이동"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/편집(_E)/고급(_d)/단어를 뒤로 이동"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/편집(_E)/고급(_d)/단어를 앞으로 이동"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/편집(_E)/고급(_d)/라인의 처음으로 이동"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/편집(_E)/고급(_d)/라인의 끝으로 이동"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/편집(_E)/고급(_d)/이전 라인으로 이동"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/편집(_E)/고급(_d)/다음 라인으로 이동"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/편집(_E)/고급(_d)/문자를 뒤로 삭제"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/편집(_E)/고급(_d)/문자를 앞으로 삭제"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/편집(_E)/고급(_d)/단어를 뒤로 삭제"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/편집(_E)/고급(_d)/단어를 앞으로 삭제"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/편집(_E)/고급(_d)/라인 삭제"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/편집(_E)/고급(_d)/라인 끝까지 삭제"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [수정됨]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "메시지%s 편집"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1004,26 +943,26 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1033,139 +972,139 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "헤더를 쓸 수가 없습니다\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "마임 타입"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "삽입"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "첨부"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "파일 첨부"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "서명"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "서명 파일을 끼워넣습니다"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "편집기"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1176,66 +1115,66 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "프로세스 그룹 id: %d를 종료시킴"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "임시 파일: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "편집: 모니터링하는 프로세스로부터 입력이 있었습니다\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "외부 편집기를 실행할 수가 없습니다\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "파일로 쓸 수가 없습니다\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "파이프 읽기 실패\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "메시지 버리기"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "버리기"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "임시 보관함으로"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "대체"
 
@@ -1243,77 +1182,76 @@ msgstr "대체"
 msgid "Edit address"
 msgstr "주소 편집"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "새 인물 추가"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "인물 상세내역 편집"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "메일 주소가 지정되지 않았습니다."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "이름과 값이 지정되지 않았습니다."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "인물 자료 편집"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "표시 명"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "마지막 이름"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "처음 이름"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "가명"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "별명"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "위로 이동"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "아래로 이동"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "수정"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "지움"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "값"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "기본 자료"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "사용자 속성"
 
@@ -1329,7 +1267,7 @@ msgstr "파일이 정상적인 주소록 형식이 아닙니다."
 msgid "Could not read file."
 msgstr "파일을 읽을 수가 없습니다."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "주소록 편집"
 
@@ -1342,7 +1280,7 @@ msgstr " 파일 확인 "
 msgid "File"
 msgstr "파일"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "새 주소록 추가"
 
@@ -1374,32 +1312,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "사용가능한 주소"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "화살표 버튼으로 그룹에서 혹은 그룹으로 전자우편 주소 이동"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "그룹 상세내용 편집"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "새 그룹 추가"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "폴더 편집"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -1411,11 +1349,11 @@ msgstr "파일이 JPilot 형식이 아닙니다."
 msgid "Select JPilot File"
 msgstr "JPilot 파일 선택"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1424,7 +1362,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "추가적인 전자우편 주소 항목(들)"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "새 JPilot 항목 추가"
 
@@ -1432,63 +1370,63 @@ msgstr "새 JPilot 항목 추가"
 msgid "Connected successfully to server"
 msgstr "서버에 성공적으로 연결되었습니다"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "서버에 연결할 수가 없습니다"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "LDAP 서버 편집"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "호스트명"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "포트"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " 서버 확인 "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr ""
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr ""
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr ""
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "기본"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "확장"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "새 LDAP 서버 추가"
 
@@ -1500,7 +1438,7 @@ msgstr "LDAP 편집 - 기본 찾기 선택"
 msgid "Available Search Base(s)"
 msgstr "가능한 기본 찾기(들)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "서버에서 기본 찾기(들)을 읽을 수 없습니다 - 수동으로 설정하세요"
 
@@ -1512,11 +1450,11 @@ msgstr "파일이 vCard 형식이 아닙니다."
 msgid "Select vCard File"
 msgstr "vCard 파일 선택"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "vCard 항목 편집"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "새 vCard 항목 추가"
 
@@ -1545,10 +1483,10 @@ msgstr "고르기..."
 msgid "Select exporting file"
 msgstr ""
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
 
@@ -1556,41 +1494,41 @@ msgstr "파일에 설정을 쓰기가 실패했습니다\n"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -1653,65 +1591,65 @@ msgstr "안읽음"
 msgid "#"
 msgstr "전체"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "모든 폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1721,16 +1659,16 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1739,24 +1677,24 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1765,34 +1703,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -1824,10 +1762,6 @@ msgstr "메시지"
 msgid "Type"
 msgstr "형식"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "갱신"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr ""
@@ -1840,15 +1774,15 @@ msgstr "읽기전용"
 msgid "unknown"
 msgstr ""
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "완료."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
@@ -1865,11 +1799,11 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(???)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -2107,7 +2041,7 @@ msgstr "속성 이름"
 msgid "Attribute"
 msgstr "속성"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "선택"
 
@@ -2131,7 +2065,7 @@ msgstr "LDIF 파일을 주소록으로 가져오기"
 msgid "Prev"
 msgstr "이전"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "다음"
 
@@ -2147,188 +2081,188 @@ msgstr "속성"
 msgid "Finish"
 msgstr ""
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "완료 (새 메시지 없음)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "소켓 에러."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -2346,7 +2280,7 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2355,11 +2289,11 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread가 glib에의해 지원되지않습니다.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2367,16 +2301,16 @@ msgstr ""
 "GnuPG가 적절하게 인스톨되지 않았거나 너무 오래된 버전입니다.\n"
 "OpenPGP 지원기능을 끕니다."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2386,64 +2320,64 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3094,58 +3028,58 @@ msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3155,16 +3089,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3173,144 +3107,144 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "받기"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "전부 받기"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "모든 계정에서 새 메일을 가져옵니다"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "작성"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "회신"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "메시지에 회신을 보냅니다"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "전체 회신"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "전달"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "메시지를 다른 사람에게 전달합니다"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "메시지를 지웁니다"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "실행"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "다음 안 읽은 메시지를 보여줍니다"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "설정"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "계정"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "계정을 설정합니다"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
@@ -3412,10 +3346,6 @@ msgstr "대소 문자 구별"
 msgid "Backward search"
 msgstr "뒤로 찾기"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "찾기"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "찾기 실패"
@@ -3440,28 +3370,28 @@ msgstr "찾기가 완료"
 msgid "Creating message view...\n"
 msgstr "메시지 뷰를 생성합니다...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "새 이름으로"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "덮어쓰기"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "기존 파일을 덮어쓰시겠습니까?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3470,7 +3400,7 @@ msgstr ""
 "인쇄 명령어서 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3530,7 +3460,7 @@ msgstr "마임 뷰를 생성합니다...\n"
 msgid "MIME Type"
 msgstr "마임 타입"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "텍스트"
 
@@ -3542,15 +3472,15 @@ msgstr "첨부"
 msgid "Select \"Check signature\" to check"
 msgstr "확인하기 위해 \"서명 확인\" 선택"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "multipart 메시지의 부분을 저장할 수가 없습니다."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "...로 열기"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3559,7 +3489,7 @@ msgstr ""
 "파일을 열 명령을 입력하세요:\n"
 "(`%s'는 파일이름으로 대체될 것입니다)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
@@ -3665,15 +3595,15 @@ msgstr "글을 올리는 도중 에러 발생\n"
 msgid "Error occurred while sending command\n"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[사용자 아이디 없음]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3686,7 +3616,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3694,72 +3624,68 @@ msgstr ""
 "Bad passphrase! 다시 시도하세요...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting에서 발견되지않은 APOP 타임 스탬프가 요구됨\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting에서 타임 스탬프에 문법 오류\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 프로토콜 에러\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "올바르지않은 xover line: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 만료된 메시지 %d를 삭제합니다\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 메시지 %d를 건너뜁니다 (%d 바이트)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "우편함이 잠겨있습니다\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "TLS 세션을 시작할 수 없습니다\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "인증 도중 에러 발생\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "명령어"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "인증 도중 에러 발생\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "%s을 발견\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "적용"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "계정 설정 창을 엽니다...\n"
@@ -3781,11 +3707,11 @@ msgstr "계정 기본 설정"
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "프라이버시"
 
@@ -3895,7 +3821,7 @@ msgstr "서버에서 모든 메시지를 받음"
 msgid "Receive size limit"
 msgstr "받을 크기 한도"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3915,7 +3841,7 @@ msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니�
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "자동"
 
@@ -3923,7 +3849,7 @@ msgstr "자동"
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "헤더"
 
@@ -3939,7 +3865,7 @@ msgstr "Message-ID 생성"
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " 편집..."
 
@@ -4130,20 +4056,20 @@ msgid ""
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "메뉴 이름:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "명령어:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4165,44 +4091,44 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "대체"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr ""
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "등록된 동작"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(새 규칙)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "메뉴 이름이 지정되지않음"
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "메뉴 이름에서 콜론 ':'을 사용할 수 없습니다."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "메뉴 이름이 너무 깁니다."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "명령이 지정되지않음"
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "메뉴 이름과 명령이 너무 깁니다."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4213,91 +4139,91 @@ msgstr ""
 "%s\n"
 "에 형식에러가 있습니다."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "동작 삭제"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "정말로 이 동작을 삭제하시겠습니까?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "일반 설정 창을 생성합니다...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "일반 설정"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "인용"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "보기"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "본문"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "기타"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "외부 프로그램"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "합체을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "명령어"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Local spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "spool로부터 합체"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "합체시 필터링"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "새 편지를 자동 검사"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr ""
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "분"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "시작할 때 새 편지를 검사"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "병합 후에 모든 지역 폴더 갱신"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "뉴스"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4305,115 +4231,115 @@ msgstr ""
 "내려받을 최대 기사 수\n"
 "(0인 경우 제한 없음)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "보낸 메시지를 '보낸 편지함'에 저장"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "보내는 메일의 문자셋"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "자동 (추천)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit 아스키 (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "유니코드 (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "서부 유럽(ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "중부 유럽(ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4421,126 +4347,126 @@ msgstr ""
 "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
 "인코딩 방식이 사용됩니다."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "서명 분리자"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "지동으로 삽입"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "자동으로 외부 편집기 사용"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "줄 바꿈 at"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "글자"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "인용도 줄 바꿈"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr ""
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "보내기 전에 줄 바꿈"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "자동으로 회신할 계정 선택"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "회신할 때 메시지를 인용"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "회신 버튼이 메일링리스트에 대한 회신으로 동작"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "회신 형식"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "인용 부호"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "전달 형식"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " 부호 설명 "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "글꼴"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "헤더 이름을 번역(`From:', `Subject:' 등등)"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr ""
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "요약 보기"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "날짜 형식"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "요약에 표시될 항목 설정... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "메시지에 색을 이용하여 보여주기"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4548,99 +4474,99 @@ msgstr ""
 "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
 "표시 (일본어인 경우에만)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "메시지 보기 위에 헤더 창 표시"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "줄 간격"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "픽셀"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "스크롤"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "반 페이지"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "부드러운 스크롤"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "첨부된 이미지 크기 조정"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "자동으로 서명 확인"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "팝업 창에 서명 확인 결과 보이기"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "비밀번호를 메모리에 임시 보관"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr ""
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "분 "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
 msgstr ""
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase를 입력할때 Grab input"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "어떤 메시지 파일도 선택되지 않았습니다."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "새 편지를 받은 후 받은 편지함으로 가기"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4648,216 +4574,216 @@ msgstr ""
 "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
 "단지 표시만 될 것입니다)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "받기 대화상자"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "받기 대화상자 보기"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "항상"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "보이지 않음"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "받기 에러 발생시 에러 상자 보이지 않음"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "끝났을 때 받기 대화상자 닫기"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "더블클릭시에 대상에 주소 추가"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "끝낼때"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "끝냈때 확인"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "끝낼때 지운 편지함 비우기"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "지운 편지함 비울때 확인하기"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "큐에 메시지가 있을 때 경고"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4881,11 +4807,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4894,7 +4820,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4902,46 +4828,46 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "글꼴 선택"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "사용자 헤더 설정"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "사용자 헤더"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "헤더 이름이 지정되지않음"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "헤더 삭제"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "정말로 이 헤더를 삭제하시겠습니까?"
 
@@ -4949,150 +4875,150 @@ msgstr "정말로 이 헤더를 삭제하시겠습니까?"
 msgid "Creating display header setting window...\n"
 msgstr "표시될 헤더 설정 창을 생성합니다...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "표시될 헤더 설정"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "헤더 이름"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "표시될 헤더"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "숨길 헤더"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "지정되지 않은 모든 헤더 표시"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "표시될 헤더 설정을 읽습니다...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "표시될 헤더 설정을 씁니다...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "이 헤더는 목록에 이미 있습니다."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "거르개 설정"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "받는 사람:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/복사(_C)..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "규칙 삭제"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "정말로 이 규칙을 삭제하시겠습니까?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "규칙 삭제"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "숨길 헤더"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "본문"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "포함"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "포함 안됨"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5149,27 +5075,27 @@ msgstr "실행"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "폴더"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "주소"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "헤더"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "헤더"
@@ -5339,7 +5265,7 @@ msgstr "템플릿을 지웁니다"
 msgid "Do you really want to delete this template?"
 msgstr "정말로 이 템플릿을 삭제하시겠습니까?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
@@ -5362,11 +5288,11 @@ msgstr "보관된 메시지 %d를 보내기가 실패했습니다.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "상태"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "진행 다이얼로그를 생성합니다...\n"
 
@@ -5378,97 +5304,66 @@ msgstr "데이타를 가져오는 중 에러가 발생했습니다.\n"
 msgid "Can't write to file.\n"
 msgstr "파일에 쓸 수가 없습니다.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "잉?: 서명이 인증되지않았습니다"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "서명이 발견되지않음"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Good signature"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "BAD signature"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "서명을 검증할 공개키가 없습니다"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "서명을 검증하는 도중 에러"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr ""
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "에러: 모르는 상태"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr ""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr ""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "이 키에 대한 사용자 ID를 찾을 수 없습니다."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr ""
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr ""
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "서명을 검증하는 도중 에러"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "`%s'에 대한 키를 선택하세요"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr ""
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "키 선택"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "키 ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "값"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "키 추가"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "다른 사용자 혹은 키 ID 입력:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "보낼 메시지의 헤더가 깨졌습니다.\n"
@@ -5555,15 +5450,77 @@ msgstr ""
 "사용하실 수 있습니다\n"
 "잘 모르겠으면 그냥 확인을 누르세요."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "서명 확인"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "서명이 발견되지않음"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Good signature"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+msgid "Signature valid but expired"
+msgstr ""
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "BAD signature"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "서명을 검증할 공개키가 없습니다"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP 인증을 사용할 수 없습니다\n"
@@ -5768,302 +5725,302 @@ msgstr "번호"
 msgid "Creating summary view...\n"
 msgstr "요약 창을 생성합니다...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "표시 처리"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "모든 메시지를 선택..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "실행을 위해 쓰레드를 없앱니다..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s 파일이 이미 존재합니다\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "텍스트 뷰를 생성합니다...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr ""
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr ""
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
 msgstr ""
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr ""
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
 msgstr ""
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr ""
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr ""
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr ""
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr ""
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr ""
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr ""
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr ""
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6096,6 +6053,33 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
 
+#~ msgid "OK"
+#~ msgstr "확인"
+
+#~ msgid "Close"
+#~ msgstr "닫기"
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
+#~ msgid "No"
+#~ msgstr "아니오"
+
+#~ msgid "Refresh"
+#~ msgstr "갱신"
+
+#~ msgid "Search"
+#~ msgstr "찾기"
+
+#~ msgid "Apply"
+#~ msgstr "적용"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "잉?: 서명이 인증되지않았습니다"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "에러: 모르는 상태"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "라벨 %s를 발견했습니다\n"
 
diff --git a/po/nl.po b/po/nl.po
index 5f347973..8ff01c71 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: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Accountinstellingen worden ingelezen...\n"
@@ -115,11 +99,11 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Naam"
 
@@ -131,30 +115,30 @@ msgstr "Protocol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "Verwijderen"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Omhoog"
@@ -163,13 +147,6 @@ msgstr "Omhoog"
 msgid " Set as default account "
 msgstr " Instellen als hoofdaccount"
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Sluiten"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Account verwijderen"
@@ -178,24 +155,15 @@ msgstr "Account verwijderen"
 msgid "Do you really want to delete this account?"
 msgstr "Wilt u dit account werkelijk verwijderen?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nee"
 
@@ -241,29 +209,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Actief: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Klaar: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Acties invoer/uitvoer"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Verzenden"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Afbreken"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -273,11 +241,11 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -295,13 +263,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -309,24 +277,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Bestand"
@@ -347,8 +298,8 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Bestand/Nieuwe _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -366,7 +317,7 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
@@ -398,7 +349,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -407,12 +358,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -429,7 +380,7 @@ msgstr "/Nieuwe _groep"
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Be_werken"
@@ -452,18 +403,18 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Naam:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -492,18 +443,6 @@ msgstr "Adres(sen) verwijderen"
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nee"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -620,7 +559,7 @@ msgstr "Adresboek omzetprobleem"
 msgid "Addressbook Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interface"
 
@@ -664,359 +603,359 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Fout"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Waarschuwingsdialoog wordt gemaakt...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Dit bericht de volgende keer weergeven"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rood"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Roze"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Groen"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Bruin"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Be_richt/_Later verzenden"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Be_richt/Klad opslaan"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Be_richt/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bijlage _invoegen"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening Invoegen"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/B_ewerken/_Ongedaan maken"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/B_ewerken/O_pnieuw toepassen"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/B_ewerken/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/B_ewerken/Knippen"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/B_ewerken/_Plakken"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/B_ewerken/Plakken als _citaat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/B_ewerken/_Alles selecteren"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/B_ewerken/Ge_avanceerd"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een teken terug"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een teken verder"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een woord terug"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/B_ewerken/Ge_avanceerd/Ga een woord verder"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar begin van regel"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar einde van regel"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar vorige regel"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/B_ewerken/Ge_avanceerd/Ga naar volgende regel"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder vorig teken"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder volgend teken"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder vorig woord"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder volgend woord"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder regel"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/B_ewerken/Ge_avanceerd/Verwijder alles tot einde regel"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/B_ewerken/Regelterugloop in hele bericht"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/B_eeld"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/B_eeld/_Aan"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/B_eeld/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/B_eeld/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/B_eeld/Ant_woord naar"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/B_eeld/_Lineaal"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/B_eeld/_Bijvoeging"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/B_ewerken/Be_werken met externe editor"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1024,26 +963,26 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1054,138 +993,138 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "kan geen headers schrijven\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME type"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1196,66 +1135,66 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Inlezen van pijp mislukt\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Gooi weg"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "opslaan als klad"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Vervangen"
 
@@ -1263,77 +1202,76 @@ msgstr "Vervangen"
 msgid "Edit address"
 msgstr "Adres bewerken"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Nieuw persoon toevoegen"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Persoonsgegevens bewerken"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Een naam en waarde moeten worden gegeven."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Persoonsgegevens bewerken"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Naam in de lijst"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Alias"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-mail adres"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Bewerken"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Legen"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Waarde"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Algemeen"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "User Attributes"
 
@@ -1349,7 +1287,7 @@ msgstr "Bestand ziet er niet uit als een geldig adresboek."
 msgid "Could not read file."
 msgstr "Kon niet uit bestand lezen."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Adresboek bewerken"
 
@@ -1362,7 +1300,7 @@ msgstr " Controleer bestand"
 msgid "File"
 msgstr "Bestand"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Adresboek toevoegen"
 
@@ -1394,33 +1332,33 @@ msgstr " <-"
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Verplaats e-mail adressen van en naar de nieuwe groep met de pijl-knoppen"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Groepsdetails bewerken"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Map hernoemen"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -1432,11 +1370,11 @@ msgstr "Bestand ziet er niet uit als een JPilot bestand."
 msgid "Select JPilot File"
 msgstr "Selecteer JPilot bestand"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr "Bladeren..."
@@ -1445,7 +1383,7 @@ msgstr "Bladeren..."
 msgid "Additional e-Mail address item(s)"
 msgstr "Extra e-mail adressen"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Voeg nieuw JPilot veld toe"
 
@@ -1453,63 +1391,63 @@ msgstr "Voeg nieuw JPilot veld toe"
 msgid "Connected successfully to server"
 msgstr "Verbinding met server tot stand gebracht"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Kon niet verbinden met de server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Bewerk LDAP server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Poort"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Controleer server"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Zoekbasis"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Zoek criterium"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Opnieuw"
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind Wachtwoord"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (sec)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Algemeen"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Uitgebreid"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "LDAP server toevoegen"
 
@@ -1521,7 +1459,7 @@ msgstr "Bewerk LDAP - Selecteer zoekbasis"
 msgid "Available Search Base(s)"
 msgstr "Beschikbare zoekbases"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Kon de zoekbasis niet inlezen vanaf de server - Kies alstublieft met de hand"
@@ -1534,11 +1472,11 @@ msgstr "Bestand ziet er niet uit als een vCard bestand."
 msgid "Select vCard File"
 msgstr "Selecteer vCard bestand"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Bewerk vCard veld"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Nieuw vCard veld toevoegen"
 
@@ -1567,10 +1505,10 @@ msgstr "Selecteer..."
 msgid "Select exporting file"
 msgstr "Selecteer doelbestand"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
 
@@ -1578,41 +1516,41 @@ msgstr "opslaan van de configuratie is mislukt\n"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -1675,65 +1613,65 @@ msgstr "Ongelezen"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Accountlijsten worden ververst..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1743,16 +1681,16 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1761,24 +1699,24 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1787,34 +1725,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -1846,10 +1784,6 @@ msgstr "Berichten"
 msgid "Type"
 msgstr "Type"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Verversen"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "gemodereerd"
@@ -1862,15 +1796,15 @@ msgstr "alleen lezen"
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Klaar."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s ingelezen)"
@@ -1887,11 +1821,11 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -2133,7 +2067,7 @@ msgstr "Attribuutnaam"
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Selecteer"
 
@@ -2157,7 +2091,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Volgende"
 
@@ -2173,189 +2107,189 @@ msgstr "Attributen"
 msgid "Finish"
 msgstr "Afronden"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sec)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3 server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -2373,7 +2307,7 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2382,11 +2316,11 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread is niet ondersteunt door glib\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2394,16 +2328,16 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of is te oud.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2413,66 +2347,66 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespacificeerde bestanden als bijvoegingen"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status\t\t\ttotaal aantal berichten weergeven"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Bezig met wegschrijven van configuratie van acties...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3122,58 +3056,58 @@ msgstr "/_Hulp/_FAQ/_Italiaans"
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3183,16 +3117,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3202,144 +3136,144 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3441,10 +3375,6 @@ msgstr "Hoofdlettergevoelig"
 msgid "Backward search"
 msgstr "Achteruit zoeken"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Zoek"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Zoeken mislukt"
@@ -3469,28 +3399,28 @@ msgstr "Zoeken voltooid"
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Bestaand bestand overschrijven?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3499,7 +3429,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3559,7 +3489,7 @@ msgstr "MIME view wordt aangemaakt...\n"
 msgid "MIME Type"
 msgstr "MIME type"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3571,15 +3501,15 @@ msgstr "Bijvoegingen"
 msgid "Select \"Check signature\" to check"
 msgstr "Selecteer \"Verifieer handtekening\" om te controleren"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Kan het deel van een meerdelig bericht niet opslaan."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Open met"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3588,7 +3518,7 @@ msgstr ""
 "Geef de opdracht om het bestand mee te openen:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIMEviewer commandoregel is ongeldig: '%s'"
@@ -3696,15 +3626,15 @@ msgstr "Er is een fout opgetreden bij het versturen\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[geen gebruikersnaam]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3717,78 +3647,74 @@ msgstr ""
 " %.*s\n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr "Slecht wachtwoord! Probeer opnieuw...\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Er is geen APOP timestamp gevonden in de begroeting\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "APOP Timestamp in de begroeting is ongeldig\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protocolfout\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "Ongeldige xover regel: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Bezig met verwijderen van verlopen bericht %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Bericht %d wordt overgeslagen (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "e-mailpostbux is vergrendeld\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "Kan TLS sessie niet starten\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "er is een fout opgetreden tijdens de identificatie\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Opdracht"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de identificatie\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "%s gevonden\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Toepassen"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
@@ -3810,11 +3736,11 @@ msgstr "Accountvoorkeuren"
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3924,7 +3850,7 @@ msgstr "Haal alle berichten op van server"
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3944,7 +3870,7 @@ msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3952,7 +3878,7 @@ msgstr "Automatisch"
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Header"
 
@@ -3968,7 +3894,7 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4165,20 +4091,20 @@ msgstr ""
 "codering te gebruiken. Het voldoet niet aan de RFC 3156\n"
 "- MIME-beveiligingsregels als u OpenPGP gebruikt."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Bezig met wegschrijven van configuratie van acties...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menunaam:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Opdrachtregel:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4214,43 +4140,43 @@ msgstr ""
 "   %F voor de lijst van bestandsnamen van geselecteerde berichten\n"
 "   %p voor het geselecteerde deel van het bericht."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Vervangen"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Syntaxhulp"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Ingestelde acties"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(nieuw)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menunaam is niet ingesteld."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Een dubbele punt is niet toegestaan in een menunaam."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menunaam is te lang."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menunaam en opdrachtregel zijn te lang."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4261,91 +4187,91 @@ msgstr ""
 "%s\n"
 "bevat een syntaxfout."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Actie verwijderen"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Wilt u werkelijk deze actie verwijderen?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Venster algemene voorkeuren wordt aangemaakt...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citaat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Beeld"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Bericht"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Diversen"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Extern programma"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Extern programma gebruiken voor verwerking van de e-mail"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokale e-mail spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Lokale e-mail beheren"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filteren bij het ophalen"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Kijk "
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "iedere"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuten of er nieuwe e-mail is."
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Kijk bij opstarten of er nieuwe e-mail is"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Ververs alle lokale mappen na de verwerking"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4353,115 +4279,115 @@ msgstr ""
 "Maximum aantal te downloaden artikelen\n"
 "(0 = alles)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Verzonden berichten opslaan in de outbox"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Codering voor uitgaande berichten"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (aanbevolen)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4469,11 +4395,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest\n"
 "optimale codering voor de huidige locale gebruikt."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Berichtcodering"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4481,116 +4407,116 @@ msgstr ""
 "Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
 "het bericht te coderen wanneer deze non-ASCII tekens bevat."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Automatisch invoegen"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "niveau van ongedaan maken"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Regelterugloop na:"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "tekens"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Regelterugloop gebruiken bij citeren"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Regelterugloop tijdens invoer"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Regelterugloop activeren bij het verzenden"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Account automatisch selecteren voor beantwoorden"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Originele bericht citeren bij beantwoorden"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Antwoordopmaak"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Citeerteken"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Doorstuuropmaak"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Beschrijving der symbolen"
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Headervelden vertalen (zoals 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "brieven"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4598,64 +4524,64 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4663,38 +4589,38 @@ msgstr ""
 "(Instellen op '0' zal het wachtwoord tot het\n"
 " einde bam de sessie opslaan)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Geen berichtsbestand geselecteerd."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
 "venster"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4702,216 +4628,216 @@ msgstr ""
 "(Berichten worden gemarkeerd voor deze acties\n"
 "wanneer dit uitgeschakeld is)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4935,11 +4861,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4953,7 +4879,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4965,15 +4891,15 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4984,31 +4910,31 @@ msgstr ""
 "op de gewenste toetscombinatie te drukken wanneer de\n"
 "muis boven het menu item zweeft."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Header aanpassen"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Header handmatig instellen"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Headernaam is niet ingesteld."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Verwijder header"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Wil je deze header werkelijk verwijderen?"
 
@@ -5016,150 +4942,150 @@ msgstr "Wil je deze header werkelijk verwijderen?"
 msgid "Creating display header setting window...\n"
 msgstr "Headerweergave instellingenvenster wordt aangemaakt...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Headerweergave instellingen"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Header naam"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Weergegeven headers"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Verborgen headers"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Alle ongespecificeerde headers weergeven"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Bezig met inlezen van headerweergaveconfiguratie...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Configuratie voor headerweergave wordt opgeslagen...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Deze header staat al in de lijst."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filterbeheer"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Aan:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopieer..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Verborgen headers"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Bericht"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "bevat"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "bevat geen"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5216,27 +5142,27 @@ msgstr "Uitvoeren"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Accounts"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Header"
@@ -5411,7 +5337,7 @@ msgstr "Verwijder sjabloon"
 msgid "Do you really want to delete this template?"
 msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
@@ -5434,11 +5360,11 @@ msgstr "Verzenden van bericht %d uit de wachtrij is mislukt.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Voortgangsdialoogvenster wordt gemaakt...\n"
 
@@ -5450,97 +5376,66 @@ msgstr "er is een fout opgetreden bij het ontvangen van de gegevens.\n"
 msgid "Can't write to file.\n"
 msgstr "Het bestand is niet beschrijfbaar.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oeps: Handtekening is niet geverifieerd"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Geen hadtekening gevonden"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Correcte handtekening"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "FOUTIEVE handtekening"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Geen publieke key om de handtekening te verifiëren"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Verschillende resultaten voor handtekeningen"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Fout: Onbekende status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Goedgekeurde handtekening van \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "SLECHTE handtekening van \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Kan gebruikers-ID niet vinden voor deze sleutel."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "\t\talias \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Handtekening gemaakt op %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Sleutel vingerafdruk: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Er is een fout opgetreden bij het controleren van de handtekening"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Selecteer sleutel voor '%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Info wordt verzameld voor '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Selecteer keys"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Sleutel ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Waarde"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Sleutel toevoegen"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Geef een ander gebruikers- of sleutel-ID"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "De header van het bericht in de wachtrij is kapot.\n"
@@ -5626,15 +5521,78 @@ msgstr ""
 "U kunt een bestaande mailbox in MH formaat gebruiken.\n"
 "Als u twijfelt, dan kunt u het beste gewoon op OK klikken."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Bezig met verifiëren handtekening"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s van \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Geen hadtekening gevonden"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Goedgekeurde handtekening van \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Correcte handtekening"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Handtekening gemaakt op %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "SLECHTE handtekening van \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "FOUTIEVE handtekening"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Geen publieke key om de handtekening te verifiëren"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH niet beschikbaar\n"
@@ -5839,269 +5797,269 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Opnieuw zoeken"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, 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:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Alle berichten worden geselecteerd..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Discussies worden uit elkaar gehaald voor de uitvoering..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "bestand %s bestaat al\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Tekstvenster wordt aangemaakt...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "een bericht wordt niet ontvangen\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Om dit deel te bewaren, kunt u met de rechter muisknop het "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "contextmenu oproepen en de optie 'Opslaan als...' selecteren,"
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
 msgstr "of druk op de 'y'-toets.\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Om dit gedeelte weer te geven als een tekstbericht"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6109,36 +6067,36 @@ msgstr ""
 "selecteert u de optie 'Als tekst weergeven', of druk op de 't'-toets.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Om dit deel te openen met een extern programma selecteert u "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "de optie 'Openen' of 'Openen met...',"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "of dubbelklik, of klik met de middelste muisknop,"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "of druk op de 'l'-toets."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Deze handtekening is nog niet gecontroleerd.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr ""
 "Om te controleren kunt u met de rechter muisknop het contextmenu oproepen\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "en de optie'Controleer handtekening' selecteren.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6171,6 +6129,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "No"
+#~ msgstr "Nee"
+
+#~ msgid "Refresh"
+#~ msgstr "Verversen"
+
+#~ msgid "Search"
+#~ msgstr "Zoek"
+
+#~ msgid "Apply"
+#~ msgstr "Toepassen"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oeps: Handtekening is niet geverifieerd"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Verschillende resultaten voor handtekeningen"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Fout: Onbekende status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "\t\talias \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Sleutel vingerafdruk: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Label gevonden: %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index 9392bc0b..7b918ec5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 0.9.9 \n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2003-12-26 11:25+0200\n"
 "Last-Translator: Przemysław Sułek <pbs@linux.net.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);jeśli nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawień wszystkich kont...\n"
@@ -114,11 +98,11 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nazwa"
 
@@ -130,30 +114,30 @@ msgstr "Protokół"
 msgid "Server"
 msgstr "Serwer"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Usuń "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "W dół"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "W górę"
@@ -162,13 +146,6 @@ msgstr "W górę"
 msgid " Set as default account "
 msgstr " Ustaw jako podstawowe konto "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zamknij"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Usuń konto"
@@ -177,24 +154,15 @@ msgstr "Usuń konto"
 msgid "Do you really want to delete this account?"
 msgstr "Czy naprawdę chcesz usunąć to konto?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Tak"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nie"
 
@@ -240,29 +208,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Wykonywanie: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Zakończono: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Wejście/wyjście poleceń"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "Wyślij"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Przerwij"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -273,11 +241,11 @@ msgstr ""
 "(`%%h' zostanie zastąpione tym argumentem)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Ukryte argumenty użytkownika akcji"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -288,7 +256,7 @@ msgstr ""
 "(`%%u' will be replaced with the argument)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Argumenty użytkownika dla akcji"
 
@@ -296,13 +264,13 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -310,24 +278,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Plik"
@@ -348,8 +299,8 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _Serwer"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -367,7 +318,7 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
@@ -399,7 +350,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -408,12 +359,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -430,7 +381,7 @@ msgstr "/Nowa _grupa"
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -440,7 +391,7 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Edycja"
@@ -453,18 +404,18 @@ msgstr "/_Usuń"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nazwa:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Usuń"
 
@@ -493,18 +444,6 @@ msgstr "Usuń adres(y)"
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nie"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -623,7 +562,7 @@ msgstr "Błąd konwersji książki adresowej"
 msgid "Addressbook Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interfejs"
 
@@ -667,359 +606,359 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Błąd"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Tworzenie panelu z ostrzeżeniami...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Wyświetl tę wiadomość następnym razem"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Pomarańczowy"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Czerwony"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Różowy"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Jasnoniebieski"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Niebieski"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zielony"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Brązowy"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Wiadomość/Wyślij _później"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Wiadomość/Zapisz w katalogu _Draft"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Wiadomość/Zapisz i dalej _edytuj"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Edycja/_Zaawansowane"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź znak do tyłu"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź znak do przodu"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź słowo do tyłu"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Edycja/_Zaawansowane/Przejdź słowo do przodu"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do początku linii"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do końca linii"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do poprzedniej linii"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Edycja/_Zaawansowane/Przejdź do następnej linii"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Edycja/_Zaawansowane/Usuń znak z tyłu"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Edycja/_Zaawansowane/Usuń znak z przodu"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Edycja/_Zaawansowane/Usuń słowo z tyłu"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Edycja/_Zaawansowane/Usuń słowo z przodu"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Edycja/_Zaawansowane/Usuń linię"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Edycja/_Zaawansowane/Usuń do końca linii"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załącznik"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Edycja/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Wiadomość/_Szyfruj"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Utwórz wiadomość%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1027,27 +966,27 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nie można znaleźć klucza związanego z wybranym identyfikatorem klucza \"%s\"."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1058,138 +997,138 @@ msgstr ""
 "%s na %s.\n"
 "Czy mimo to wysłać wiadomość?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "nie można zapisać nagłówków\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "typ MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Dołącz plik"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1200,66 +1139,66 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Identyfikator zakończonej grupy procesów: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Plik tymczasowy: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Edycja: wejście z procesu monitorującego\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Nie można uruchomić zewnętrznego edytora\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Nie można zapisać do pliku\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Błędny odczyt z potoku\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Porzuć wiadomość"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Porzuć"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "do Draft"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Zamień"
 
@@ -1267,77 +1206,76 @@ msgstr "Zamień"
 msgid "Edit address"
 msgstr "Edytuj adres"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Dodaj nową osobę"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Edytuj informacje osoby"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Należy podać adres e-mail."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Należy podać nazwę i wartość."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Edytuj dane osoby"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Imię"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Pseudonim"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Zwany inaczej"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "W górę"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "W dół"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Zmień"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Wartość"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Dane podstawowe"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atrybuty użytkownika"
 
@@ -1353,7 +1291,7 @@ msgstr "Plik nie wygląda na poprawny plik książki adresowej."
 msgid "Could not read file."
 msgstr "Nie można odczytać pliku."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Edytuj książkę adresową"
 
@@ -1366,7 +1304,7 @@ msgstr " Sprawdź plik"
 msgid "File"
 msgstr "Plik"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Dodaj nową książkę adresową"
 
@@ -1398,32 +1336,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Dostępne adresy"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Przenieś przyciskami strzałek adresy email do lub z grupy"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Edytuj szczegóły grupy"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -1435,11 +1373,11 @@ msgstr "Plik nie wygląda na plik formatu JPilot."
 msgid "Select JPilot File"
 msgstr "Wybierz plik JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1448,7 +1386,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Dodatkowe elementy adresu email"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Dodaj nowy wpis JPilot"
 
@@ -1456,63 +1394,63 @@ msgstr "Dodaj nowy wpis JPilot"
 msgid "Connected successfully to server"
 msgstr "Połączono pomyślnie z serwerem"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Nie można połączyć się z serwerem"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Edytuj serwer LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Sprawdź serwer "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Przeszukuj bazę"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Kryteria wyszukiwania"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Zeruj "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Wiąż DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Wiąż hasło"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Opóźnienie (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Rozszerzone"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "/Dod_aj nowy serwer LDAP"
 
@@ -1524,7 +1462,7 @@ msgstr "Edytuj LDAP - Wybierz bazę wyszukiwania"
 msgid "Available Search Base(s)"
 msgstr "Dostępne bazy wyszukiwania"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Nie można odczytać baz wyszukiwania z serwera - ustaw ją ręcznie"
 
@@ -1536,11 +1474,11 @@ msgstr "Plik nie wygląda na plik w formacie VCard."
 msgid "Select vCard File"
 msgstr "Wybierz plik VCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Edytuj wpis VCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Dodaj nowy wpis VCard"
 
@@ -1569,10 +1507,10 @@ msgstr " Wybierz... "
 msgid "Select exporting file"
 msgstr "Wybierz plik eksportu"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
 
@@ -1580,41 +1518,41 @@ msgstr "błąd podczas zapisu konfiguracji do pliku\n"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -1677,64 +1615,64 @@ msgstr "Nieprzeczytane"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Odbudowywanie wszystkich drzew katalogów..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Wysyłanie wiadomości..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1744,16 +1682,16 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1762,24 +1700,24 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1788,34 +1726,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -1847,10 +1785,6 @@ msgstr "Wiadomości"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Odśwież"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderowana"
@@ -1863,15 +1797,15 @@ msgstr "tylko do odczytu"
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Gotowe."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "pobrano %d grup dyskusyjnych (%s przeczytano)"
@@ -1888,11 +1822,11 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Bez Od)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -2126,7 +2060,7 @@ msgstr "Nazwa atrybutu"
 msgid "Attribute"
 msgstr "Atrybut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Wybierz"
 
@@ -2150,7 +2084,7 @@ msgstr "Importuj plik LDIF do książki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Następna"
 
@@ -2166,134 +2100,134 @@ msgstr "Atrybuty"
 msgid "Finish"
 msgstr "Koniec"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomości)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Opóźnienie (sek)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2302,27 +2236,27 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2331,11 +2265,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2344,16 +2278,16 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "przekroczenie czasu sesji\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -2371,7 +2305,7 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2380,11 +2314,11 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "Bibltioteka glib nie obsługuje wywołania g_thread.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2392,16 +2326,16 @@ msgstr ""
 "Program GnuPG nie jest poprawnie zainstalowany, lub jego\n"
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2411,23 +2345,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2435,41 +2369,41 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Ustawienia akcji"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3113,58 +3047,58 @@ msgstr "/_Pomoc/_FAQ/_Włoskie"
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3174,16 +3108,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3193,144 +3127,144 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpowied_z/_liście dyskusyjnej"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Odbierz nową pocztę"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz nową pocztę z wszystkich kont"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomość"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Przekaż"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Przekaż wiadomość dalej"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Usuń wiadomość"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Następna nieprzeczytana wiadomość"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
@@ -3432,10 +3366,6 @@ msgstr "Rozróżnianie wielkości liter"
 msgid "Backward search"
 msgstr "Wyszukiwanie wstecz"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Szukaj"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Błąd wyszukiwania"
@@ -3460,28 +3390,28 @@ msgstr "Przeszukiwanie zakończone"
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomości...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Zapisz jako"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Czy nadpisać istniejący plik?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3490,7 +3420,7 @@ msgstr ""
 "Podaj polecenie wydruku:\n"
 "(\"%s\" zostanie zastąpione nazwą pliku)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3550,7 +3480,7 @@ msgstr "Tworzenie widoku MIME...\n"
 msgid "MIME Type"
 msgstr "Typ MIME "
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3562,15 +3492,15 @@ msgstr "Załączniki"
 msgid "Select \"Check signature\" to check"
 msgstr "Wybierz \"Sprawdź podpis\" by sprawdzić"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Nie można zapisać części wiadomości wieloczęściowej."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Otwórz z"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3579,7 +3509,7 @@ msgstr ""
 "Wprowadź polecenie dla otwarcia pliku:\n"
 "(\"%s\" zostanie zastąpione nazwą pliku)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
@@ -3686,15 +3616,15 @@ msgstr "Wystąpił błąd podczas publikowania\n"
 msgid "Error occurred while sending command\n"
 msgstr "Błąd podczas wysyłania wiadomości."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[ brak identyfikatora ]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3707,7 +3637,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3715,70 +3645,66 @@ msgstr ""
 "Niewłaściwe hasło! Spróbuj ponownie...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Przy powitaniu zabrakło wymaganego znacznika czasowego APOP\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Błąd składni przy znaczniku czasowym powitania\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Błąd protokołu POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Usuwanie przestarzałej wiadomości %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pomijanie wiadomości %d (%d bajtów)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "skrzynka jest zablokowana\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "przekroczenie czasu sesji\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "nie można uruchomić sesji TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "wystąpił błąd podczas uwierzytelniania\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "nieobsługiwane polecenie\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Znaleziono: %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Zastosuj"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
@@ -3800,11 +3726,11 @@ msgstr "Preferencje konta"
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Prywatność"
 
@@ -3914,7 +3840,7 @@ msgstr "Pobieranie wszystkich wiadomości z serwera"
 msgid "Receive size limit"
 msgstr "Ograniczenie wielkości pobierania"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3934,7 +3860,7 @@ msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -3942,7 +3868,7 @@ msgstr "Automatycznie"
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Nagłówek"
 
@@ -3958,7 +3884,7 @@ msgstr "Generowanie identyrikatora wiadomości"
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4153,19 +4079,19 @@ msgstr ""
 "dla kodowanych wiadomości. Nie jest to zgodne z RFC 3156\n"
 "- Bezpieczeństwo MIME z OpenPGP"
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Ustawienia akcji"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nazwa w menu:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Polecenie:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4205,43 +4131,43 @@ msgstr ""
 "   %h dla ukrytego argumentu podanego przez użytkownika\n"
 "   %s dla wybranego tekstu"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Zamień "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Pomoc składni "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Zarejestrowane polecenia"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nowy)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Nie ustawiono nazwy w menu."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dwukropek \":\" nie jest dopuszczalny w nazwie w menu."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Nazwa w menu jest zbyt długa."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Nazwa w menu i polecenie jest zbyt długie."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4252,91 +4178,91 @@ msgstr ""
 "%s\n"
 "posiada błąd składni."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Usuń polecenie"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdę usunąć to polecenie?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Tworzenie okna preferencji...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferencje"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Cytat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Wyświetlanie"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Inne"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Program zewnętrzny"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Użycie zewnętrznego programu do odbierania poczty"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokalny Spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Odbierz ze spoola"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrowanie przy odbieraniu"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automatyczne sprawdzanie poczty"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "każde"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuta(y)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu programu"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4344,115 +4270,115 @@ msgstr ""
 "Maksymalna liczba pobieranych artykułów\n"
 "(bez ograniczeń - 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Zapisywanie wysłanych wiadomości do Poczta wysłana"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Strona kodowa dla wychodzących"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatycznie (Zalecane)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitów ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Śodkowa (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Kraje Bałtyckie (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Kraje Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grecja (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcja (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonia (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonia (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonia (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczony Chiny (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjny Chiny (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjny Chiny (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chiny (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tajlandia (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tajlandia (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4460,11 +4386,11 @@ msgstr ""
 "Jeśli wybrano \"Automatycznie\" to zostanie użyte\n"
 "optymalne kodowanie dla bieżących ustawień lokalnych."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Kodowanie przesyłanych danych"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4472,178 +4398,178 @@ msgstr ""
 "Opcja ta określa Content-Transfer-Encoding dla sytuacji,\n"
 "gdzie treść listu zawiera znaki nie-ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Automatyczne wstawianie podpisu"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automatyczne uruchamianie zewnętrznego edytora"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Poziom Cofnij"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomości przy"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znakach"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Zawijanie cytatu"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Zawijanie podczas wprowadzania"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Zawijanie przed wysłaniem"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automatyczne ustawianie konta dla odpowiedzi"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Cytowanie wiadomości przy odpowiedzi"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk Odpowiedz wysyła odpowiedź na listę dyskusyjną"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Format przekazywania"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Opis symboli "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Tłumaczenie nazwy nagłówka (jak np. 'Od:', 'Temat:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup dłuższych niż "
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "liter"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Widok listy wiadomości"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Ustaw element wyświetlania podsumowania... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Włączenie kolorowania wiadomości"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Odstęp międzywierszowy"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Wygładzone przewijanie"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasowywanie rozmiaru dołączonych obrazków"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpisów"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Wygasanie po"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4651,37 +4577,37 @@ msgstr ""
 "(Wartość \"0\" ustawi zapamiętywanie hasła na czas\n"
 " całej sesji)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4689,216 +4615,216 @@ msgstr ""
 "(Wiadomości pozostaną zaznaczone do wykonania\n"
 " gdy opcja ta jest wyłączona)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Wyświetlanie okna dialogowego odbierania"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Podczas wyjścia"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Opróżnianie śmietnika przy zamykaniu programu"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Wyświetlanie pytania przed opróżnieniem"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4922,11 +4848,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4940,7 +4866,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4952,15 +4878,15 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Wybór czcionki"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4970,31 +4896,31 @@ msgstr ""
 "Można również zmienić każdy skrót klawiaturowy w menu\n"
 "naciskając klawisze gdy kursor myszy znajduje się nad elementem."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Ustawienia nagłówka użytkownika"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Nagłówki użytkownika"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Brak nazwy nagłówka."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Usuń nagłówek"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Czy naprawdę chcesz usunąć ten nagłówek?"
 
@@ -5002,149 +4928,149 @@ msgstr "Czy naprawdę chcesz usunąć ten nagłówek?"
 msgid "Creating display header setting window...\n"
 msgstr "Tworzenie okna ustawień wyświetlania nagłówka\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Ustawienia wyświetlania nagłówka"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Nazwa nagłówka"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Wyświetlone nagłówki "
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Ukryte nagłówki"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Wyświetl wszystkie nieokreślone nagłówki"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Odczytywanie konfiguracji wyświetlania nagłówków...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Zapisywanie konfiguracji wyświetlania nagłówków...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Taki nagłówek już występuje."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "UStawienia filtra"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Góra"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Dół"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopiuj..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Usuń regułę"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Naprawdę chcesz usunąć tę regułę?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Usuń regułę"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Ukryte nagłówki"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Nagłówek"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Wiadomość"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "zawiera"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nie zawiera"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5201,27 +5127,27 @@ msgstr "Wykonaj"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Katalog"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Nagłówek"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Nagłówek"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Nagłówek"
@@ -5392,7 +5318,7 @@ msgstr "Usuń szablon"
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdę chcesz usunąć ten szablon?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
@@ -5415,11 +5341,11 @@ msgstr "Błąd wysyłania wiadomości %d z kolejki.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Stan"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Tworzenie dialogu postępu...\n"
 
@@ -5431,97 +5357,66 @@ msgstr "błąd podczas odbierania danych.\n"
 msgid "Can't write to file.\n"
 msgstr "Nie można zapisać do pliku.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Podpis nie zweryfikowany"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Nie znaleziono podpisu"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Poprawny podpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "ZŁY podpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Brak klucza publicznego dla sprawdzenia podpisu"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Błąd podczas sprawdzania podpisu"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Różne wyniki dla podpisów"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Błąd: Nieznany stan"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Poprawny podpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "NIEPOPRAWNY podpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Nie można znaleźć ID użykownika dla tego klucza"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                jako \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis wykonano %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Odcisk klucza: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Błąd podczas sprawdzania podpisu"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Wybierz klucz dla `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Zbieranie informacji dla \"%s\" ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Wybierz klucze"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID klucza"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Wartość"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj klucz"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Wprowadź innego użytkownika lub ID klucza:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Uszkodzony nagłówek wiadomości w kolejce.\n"
@@ -5609,15 +5504,78 @@ msgstr ""
 "skrzynki w formacie MH.\n"
 "W przypadku braku pewności, należy wybrać OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Sprawdzanie podpisu"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Nie znaleziono podpisu"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Poprawny podpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Poprawny podpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Podpis wykonano %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "NIEPOPRAWNY podpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "ZŁY podpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Brak klucza publicznego dla sprawdzenia podpisu"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH niedostępna\n"
@@ -5821,272 +5779,272 @@ msgstr "Nr"
 msgid "Creating summary view...\n"
 msgstr "Tworzenie widoku podsumowania...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Znacznik procesu"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "brak niektórych znaczników, czy wykonać ?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 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:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 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:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 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:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 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:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 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:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 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:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 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:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Folder docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Folder docelowy jest taki sam jak bieżący."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Wybieranie wszystkich wiadomości..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Odwątkowanie w celu wykonania..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "plik %s już istnieje\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Tworzenie widoku tekstowego...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "By zapisać tę część, rozwiń menu kontekstowe "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "prawym przyciskiem i wybierz \"Zapisz jako...\","
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6094,11 +6052,11 @@ msgstr ""
 "lub naciśnij \"y\".\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "By wyświetlić część jako wiadomość tekstową wybierz"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6106,35 +6064,35 @@ msgstr ""
 "\"Wyświetl jako tekst\" lub naciśnij klawisz \"t\".\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "By otworzyć tę część w zewnętrznym programie wybierz"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Otwórz' lub `Otwórz z...',"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "lub kliknij podwójnie, lub w środek przycisku,"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "lub naciśnij klawisz \"l\"."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Ten podpis nie został jeszcze sprawdzony.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "By to sprawdzić, rozwiń menu kontekstowe prawym \n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "przyciskiem myszy i wybierz \"Sprawdź podpis\".\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6167,6 +6125,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Zamknij"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
+#~ msgid "Refresh"
+#~ msgstr "Odśwież"
+
+#~ msgid "Search"
+#~ msgstr "Szukaj"
+
+#~ msgid "Apply"
+#~ msgstr "Zastosuj"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Podpis nie zweryfikowany"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Różne wyniki dla podpisów"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Błąd: Nieznany stan"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                jako \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Odcisk klucza: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Znaleziono etykietę: %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1463163..a47c4d00 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2002-07-15 13:06-0300\n"
 "Last-Translator: André Casteliano <digitalcoder@users.sourceforge.net>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -66,22 +66,6 @@ msgstr ""
 "programa; caso não, escreva para a Free Software Foundation, Inc., \n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Aceitar"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configurações de cada conta...\n"
@@ -114,11 +98,11 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
@@ -130,30 +114,30 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Apagar "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Acima"
@@ -162,13 +146,6 @@ msgstr "Acima"
 msgid " Set as default account "
 msgstr " Marcar como conta padrão "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Fechar"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Apagar conta"
@@ -177,24 +154,15 @@ msgstr "Apagar conta"
 msgid "Do you really want to delete this account?"
 msgstr "Você realmente deseja apagar esta conta?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Sim"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Não"
 
@@ -240,29 +208,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Rodando: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Terminou: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Entrada/saída das Ações"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Enviar "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,11 +240,11 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -286,7 +254,7 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -294,13 +262,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adicionar ao Livro de endereços"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Notas"
 
@@ -308,24 +276,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Livro de Endereços"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -346,8 +297,8 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -365,7 +316,7 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
@@ -397,7 +348,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -406,12 +357,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
@@ -428,7 +379,7 @@ msgstr "/Novo _Grupo"
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -438,7 +389,7 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Editar"
@@ -451,18 +402,18 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Livro de endereços"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Nome:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Apagar"
 
@@ -491,18 +442,6 @@ msgstr "Apagar endereço(s)"
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Não"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -620,7 +559,7 @@ msgstr "Erro de conversão de livro de endereços"
 msgid "Addressbook Conversion"
 msgstr "Conversão de Livro de endereços"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interface"
 
@@ -664,360 +603,360 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Erro"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Criando a tela de alerta...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Mostrar essa mensagem da próxima vez"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Azul céu"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Marrom"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensagem/Enviar _depois"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensagem/Salvar na pasta rascunho"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensagem/Salvar e _continuar editando"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para a trás"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o fim da linha"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar linha"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o fim da linha"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as _linhas grandes"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/C_opiar"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/E_xibir/_Seguir respondendo"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com editor e_xterno"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensagem/_Encriptar"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 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:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compondo mensagem%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Compondo mensagem%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto vazio. Enviar assim mesmo?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1025,26 +964,26 @@ msgstr ""
 "Conta para envio de mensagem não está especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Não foi possível armazenar a mensagem na caixa de saída."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível obter nenhuma chave associada ao ID Selecionado '%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "Não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1054,139 +993,139 @@ msgstr ""
 "Não foi possível converter o código de caracteres da mensagem.\n"
 "Enviar assim mesmo?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "não foi possível escrever o cabeçalho\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "colocando mensagem na fila...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "Não foi possível por a mensagem na fila\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Por na 'fila de saída' e enviar depois"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas grandes"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,66 +1136,66 @@ msgstr ""
 "Deseja matar o processo?\n"
 "Id. do grupo do processo : %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de processo id.: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Arquivo temporário: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Compositor: entrada para monitorar processo\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Não foi possível executar o editor externo\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Não foi possível gravar o arquivo\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Fallhou ao ler o pipe\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Não foi possível por a mensagem na fila."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Descartar mensagem"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensagem foi modificada. Deseja descartá-la ?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "como rascunho"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Substituir"
 
@@ -1264,77 +1203,76 @@ msgstr "Substituir"
 msgid "Edit address"
 msgstr "Editar endereço"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Adicionar nova pessoa"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Editar detalhes da pessoa"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Um Nome e um Valor devem ser informados"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Editar dados pessoais"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Exibir Nome"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Apelido"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Apelido"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Mover para cima"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valor"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Dados Básicos"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributos de Usuário"
 
@@ -1350,7 +1288,7 @@ msgstr "O arquivo não parece estar em um formato de livro de endereços válido
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo"
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Editar Livro de Endereços"
 
@@ -1363,7 +1301,7 @@ msgstr " Verificar Arquivo "
 msgid "File"
 msgstr "Arquivo"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Adicionar Novo Livro de endereços"
 
@@ -1395,33 +1333,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Endereços Disponíveis"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Mover endreços de e-mail para ou a partir grupos com as setas dos botões"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Editar Detalhes de Grupo"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Adicionar Novo Grupo"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Editar pasta"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -1433,11 +1371,11 @@ msgstr "O arquivo não parece estar no formato JPilot."
 msgid "Select JPilot File"
 msgstr "Selecionar Arquivo JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1446,7 +1384,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Item(s) de endereço e e-mail adicionais"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Adicionar nova entrada JPilot"
 
@@ -1454,63 +1392,63 @@ msgstr "Adicionar nova entrada JPilot"
 msgid "Connected successfully to server"
 msgstr "Conectado ao servidor com sucesso"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Editar Servidor LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Nome da máquina"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Porta"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Conferir Servidor "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Procurar Base"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Critério de Procura"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Recomeçar "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Ligar DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Senha da Ligação"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (segundos)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Máximo de Entradas"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Básicas"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Extendido"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Adicionar Novo Servidor LDAP"
 
@@ -1522,7 +1460,7 @@ msgstr "Editar LDAP - Selecione Base de Procura"
 msgid "Available Search Base(s)"
 msgstr "Base(s) de Procura disponível(is)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Não foi spossível ler a(s) Base(s) de Procura do servidor - por favor defina "
@@ -1536,11 +1474,11 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar Arquivo vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Editar Entrada vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Adicionar Nova Entrada vCard"
 
@@ -1569,10 +1507,10 @@ msgstr "Selecionar..."
 msgid "Select exporting file"
 msgstr "Selecione o filtro de exportação"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "falhou ao gravar a configuração no arquivo\n"
 
@@ -1580,41 +1518,41 @@ msgstr "falhou ao gravar a configuração no arquivo\n"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -1677,65 +1615,65 @@ msgstr "Não lido"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Revisando todas as árvores de pastas..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensagem"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1745,16 +1683,16 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1763,24 +1701,24 @@ msgstr ""
 "Todas as pastas e mensagens sob `%s' serão apagados.\n"
 "Confirma a exclusão?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1789,34 +1727,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -1848,10 +1786,6 @@ msgstr "Mensagens"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Atualizar"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderado"
@@ -1864,15 +1798,15 @@ msgstr "somente para leitura"
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Feito."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de notícias recebidos (%s lidos)"
@@ -1889,11 +1823,11 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -2132,7 +2066,7 @@ msgstr "Nome do Atributo"
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Selecione"
 
@@ -2156,7 +2090,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Próxima"
 
@@ -2172,189 +2106,189 @@ msgstr "Atributos"
 msgid "Finish"
 msgstr "Terminar"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Feito (Não há mensagens novas)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (segundos)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo Mensagens de %s até %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexão falhou"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "erro de socket."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Método de Autenticação"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Método de Autenticação"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -2372,7 +2306,7 @@ msgstr "Informe a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2381,11 +2315,11 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportada pela glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2393,80 +2327,80 @@ msgstr ""
 "GnuPG não está instalado adequadamente.\n"
 "Suporte a OpenPGP desabilitado."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensagens"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensagens"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Deseja sair?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Algumas mensagens não enviadas estão na fila. Sair agora?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Gravando configurações das ações...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3116,58 +3050,58 @@ msgstr "/_Ajuda/_FAQ/_Italiano"
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separação de janela de %d para %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3177,16 +3111,16 @@ msgstr ""
 "Se uma caixa de correio existente é especificada, ela será\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3196,144 +3130,144 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "Res_ponder para/_quem enviou"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "Responder para/_lista"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Próxima mensagem não lida"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Preferências da conta"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3435,10 +3369,6 @@ msgstr "Maiús./minús."
 msgid "Backward search"
 msgstr "Procurar para trás"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Procurar"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Erro na procura"
@@ -3463,28 +3393,28 @@ msgstr "Procura concluída"
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Salvar como"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3493,7 +3423,7 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3553,7 +3483,7 @@ msgstr "Criando visualizador de MIME...\n"
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Texto"
 
@@ -3565,15 +3495,15 @@ msgstr "Anexos"
 msgid "Select \"Check signature\" to check"
 msgstr "Selecione \"Checar assinatura\" para checar"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Não foi possível gravar alguma(s) parte(s) dessa mensagem"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Abrir com"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3582,7 +3512,7 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "(`%s' será sustituído pelo arquivo)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "O comando do visualizador MIME é inválido: `%s'"
@@ -3688,15 +3618,15 @@ msgstr "Ocorreu um erro quando postando\n"
 msgid "Error occurred while sending command\n"
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[sem id de usuário]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3709,7 +3639,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3717,72 +3647,68 @@ msgstr ""
 "Senha errada! Tente novamente...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Timestamp APOP requerida não encontrada no greeting\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe no greeting\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "linha xover inválida: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Apagando mensagem expirada %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Pulando mensagem %d (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "a caixa de correio está travada\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "não foi possível iniciar sessão TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Comando"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "ocorreu um erro na autenticação\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Encontrado %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Aplicar"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de preferências da conta...\n"
@@ -3804,11 +3730,11 @@ msgstr "Preferências da Conta"
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -3918,7 +3844,7 @@ msgstr "Receber todas as mensagens no servidor"
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3938,7 +3864,7 @@ msgstr "(Mensagens não filtradas serão guardadas nesta pasta)"
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automático"
 
@@ -3946,7 +3872,7 @@ msgstr "Automático"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Obter todas' confere novas mensagens nessa conta"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Cabeçalho"
 
@@ -3962,7 +3888,7 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4158,20 +4084,20 @@ msgstr ""
 "para mensagens encriptadas. Não é compatível com a \n"
 "RFC 3156 - Segurança MIME com OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Gravando configurações das ações...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Nome do Menu:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Linha de Comando:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4207,44 +4133,44 @@ msgstr ""
 "   %F para a lista de nomes de arquivo das mensagens selecionadas\n"
 "   %p para a parte selecionada da mensagem."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Substituir"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr "Ajuda com sintaxe"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Ações registradas"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Novo)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Nome do menu não definido."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dois pontos (':') não são permitidos no nome do menu."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Nome do menu é muito longo."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Linha de comando não definida."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Nome do menu e o comando são muito longos."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4255,91 +4181,91 @@ msgstr ""
 "%s\n"
 "tem um erro de sintaxe."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Apagar ação"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Você realmente deseja apagar esta ação?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Criando janela de preferências comuns...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferências comuns"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citação"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Exibir"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Outros"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Programa externo"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Usar um programa externo para obter mensagens"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Comando"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Spool local"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorporar do spool"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrar ao incorporar"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Checar nova mensagem"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "a cada"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Checar o correio quando iniciar"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Atualizar todas as pastas locais ao incorporar"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Notícias"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4347,115 +4273,115 @@ msgstr ""
 "Número máximo de artigos para baixar\n"
 "(ilimitado se 0 for especificado)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Salvar mensagens enviadas na Caixa de saída"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Conjunto de caracteres para enviar"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4463,126 +4389,126 @@ msgstr ""
 "Se `Automático' for selecionado, a melhor codificação\n"
 "para o locale atual será usada."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Inserir automaticamente"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Executar o editor externo automaticamente"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Nível de desfazer"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Quebrar mensagens em"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Quebrar quote"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Quebrar na entrada"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Escolher conta para respostas automaticamente"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Quotar mensagem ao responder"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Botão de responder chama resposta para a lista"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formato de Mensagem Encaminhada"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Descrição dos símbolos "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduzir cabeçalhos (como `De:', `Assunto:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Exibir número de não lidas próximas ao nome da pasta"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "letras"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Visão de Sumário "
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Elementos visíveis no cabeçalho... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4590,64 +4516,64 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e numéricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Exibir cabeçalho acima da visão da mensagem"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Cabeçalhos pequenos na visualização da mensagem"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na memória"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4655,36 +4581,36 @@ msgstr ""
 "(Definindo '0' irá guardar a senha para\n"
 " toda a sessão)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nenhum arquivo de mensagem selecionado."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4692,216 +4618,216 @@ msgstr ""
 "(Mensagens serão marcadas até a execução\n"
 " se isto estiver desligado)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Diálogo de recepção"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Exibir diálogo de recepção"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Fechar diálogo de recepção quando terminar"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endereço para o destino quando clicado duas vezes"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 24 horas"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 12 horas"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4926,11 +4852,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4944,7 +4870,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4956,15 +4882,15 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Seleção de fonte"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4975,31 +4901,31 @@ msgstr ""
 "pressionando qualquer tecla enquanto coloca o ponteiro\n"
 "do mouse sobre o item."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Configuração de cabeçalho personalizado"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Cabeçalhos personalizados"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Nome do cabeçalho não definido."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Apagar cabeçalho"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Quer realmente apagar este cabeçalho?"
 
@@ -5007,150 +4933,150 @@ msgstr "Quer realmente apagar este cabeçalho?"
 msgid "Creating display header setting window...\n"
 msgstr "Criando janela de configuração de cabeçalhos personalizados...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "/E_xibir configuração de cabeçalho"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Nome do cabeçalho"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Cabeçalhos mostrados"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Cabeçalhos escondidos"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Mostrar todos os cabeçalhos não especificados"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Lendo configuração para mostrar cabeçalhos...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Gravando configuração para os cabeçalhos mostrados...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Este cabeçalho já está na lista."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Configuração de filtros"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Para:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Copiar..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Apagar regra"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Quer realmente apagar esta regra?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Apagar regra"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Todos os cabeçalhos"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Cabeçalho"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Mensagem"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "contém"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "não contém"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5207,27 +5133,27 @@ msgstr "Executar"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Pasta"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Endereço"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Cabeçalho"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Cabeçalho"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Cabeçalho"
@@ -5401,7 +5327,7 @@ msgstr "Apagar modelo"
 msgid "Do you really want to delete this template?"
 msgstr "Quer realmente apagar este modelo?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversão de código falhou.\n"
 
@@ -5424,11 +5350,11 @@ msgstr "Falha ao enviar a mensagen %d.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impressão é inválido: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Criando diálogo de progresso...\n"
 
@@ -5440,97 +5366,66 @@ msgstr "ocorreu um erro enquanto os dados eram obtidos.\n"
 msgid "Can't write to file.\n"
 msgstr "Não foi possível gravar no arquivo.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Assinatura não verificada"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Assinatura não encontrada"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Assinatura correta"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "Assinatura ERRADA"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Sem chave pública para verificar a assinatura"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Erro verificando a assinatura"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Resultados diferentes para assinaturas"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Erro: Status desconhecido"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Assinatura correta de \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Assimanatura ERRADA de \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Não posso encontrar identificação de usuário para esta chave."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "\t\t\t\t\t\tconhecido como \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Assinatura feita em %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Chave fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Erro verificando a assinatura"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Por favor selecione a chave para `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Coletando informação para `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Selecione Chaves"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Key ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Valor"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Adicionar chave"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Informe outro usuário ou ID da chave:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Mensagem da fila com cabeçalho corrompido.\n"
@@ -5617,15 +5512,78 @@ msgstr ""
 "caso você possua uma.\n"
 "Caso voê não tenha certeza, somente selecione OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Checando assinatura"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s de \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Assinatura não encontrada"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Assinatura correta de \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Assinatura correta"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Assinatura feita em %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Assimanatura ERRADA de \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "Assinatura ERRADA"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Sem chave pública para verificar a assinatura"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não disponível\n"
@@ -5830,258 +5788,258 @@ msgstr "Não."
 msgid "Creating summary view...\n"
 msgstr "Criando visualizador de sumários...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Procesar marca"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Algumas marcas foram deixadas. Processá-las?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Procurar novamente"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 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:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Selecionando todas as mensagens"
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Desfazendo a hierarquia para a execução..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "a mensagem %d já está no cache.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "arquivo %s já existe\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Criando visualização do texto...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "uma mensagem não será recebida\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Para salvar esta parte, abra o menu contextual com o"
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "botão direito e selecione `Salvar como...' "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6089,11 +6047,11 @@ msgstr ""
 "ou tecle `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Para ver esta parte como uma mensagem de texto, selecione"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6101,35 +6059,35 @@ msgstr ""
 "`Exibir como texto', ou tecle `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Para abrir esta parte com um programa externo, selecione"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Abrir' ou `Abrir com...'. "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ou duplo-clique, ou clique com o botão do meio, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ou pressione `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Esta assinatura ainda não foi checada.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Para checá-la, abra o menu de contexto com\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "um clique do botão direito e selecione `Checar assinatura'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6162,6 +6120,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "Erro ao gravar em %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "Aceitar"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "No"
+#~ msgstr "Não"
+
+#~ msgid "Refresh"
+#~ msgstr "Atualizar"
+
+#~ msgid "Search"
+#~ msgstr "Procurar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Assinatura não verificada"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Resultados diferentes para assinaturas"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Erro: Status desconhecido"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "\t\t\t\t\t\tconhecido como \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Chave fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Texto encontrado: %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index c653ea9c..93784649 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -66,22 +66,6 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Citire configuraţia conturilor...\n"
@@ -117,11 +101,11 @@ msgstr ""
 "mesajelor de comanda `Ia tot'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Nume"
 
@@ -133,30 +117,30 @@ msgstr "Protocol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Adăugare"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Editare"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Ştergere "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Jos"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Sus"
@@ -166,13 +150,6 @@ msgstr "Sus"
 msgid " Set as default account "
 msgstr " Setare drept cont curent "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Închidere"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Ştergere cont"
@@ -181,24 +158,15 @@ msgstr "Ştergere cont"
 msgid "Do you really want to delete this account?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nu"
 
@@ -239,31 +207,31 @@ msgid ""
 "%s"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1094
+#: src/action.c:1095
 #, fuzzy
 msgid " Send "
 msgstr "Trimitere"
 
-#: src/action.c:1105
+#: src/action.c:1106
 #, fuzzy
 msgid "Abort"
 msgstr "Despre"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -273,11 +241,11 @@ msgstr ""
 "Introduceţi linia de comandă pentru imprimare:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "Introduceţi linia de comandă pentru imprimare:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -295,13 +263,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresă"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Observaţii"
 
@@ -309,24 +277,7 @@ msgstr "Observaţii"
 msgid "Select Address Book Folder"
 msgstr "Selectaţi un director"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Anulare"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Fişier"
@@ -347,8 +298,8 @@ msgstr "/_Fişier/_JPilot nou"
 msgid "/_File/New _Server"
 msgstr "/_Fişier/Server _LDAP nou"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -367,7 +318,7 @@ msgstr "/_Fişier/Ş_tergere"
 msgid "/_File/_Save"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Fişier/Î_nchidere"
 
@@ -399,7 +350,7 @@ msgstr "/_Adresă/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adresă/Ş_tergere"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 #, fuzzy
 msgid "/_Tools"
@@ -409,12 +360,12 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fişier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
@@ -434,7 +385,7 @@ msgstr "/_Grup nou"
 msgid "/New _Folder"
 msgstr "/_Director nou"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -444,7 +395,7 @@ msgstr "/_Director nou"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Editare"
@@ -457,18 +408,18 @@ msgstr "/Ş_tergere"
 msgid "E-Mail address"
 msgstr "Adresă E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Agendă"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr " Nume:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Ştergere"
 
@@ -497,18 +448,6 @@ msgstr "Ştergere adrese"
 msgid "Really delete the address(es)?"
 msgstr "Sunteţi sigur că doriţi sa ştergeţi adresa (adresele) ?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nu"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -627,7 +566,7 @@ msgstr "Eroare de convertire a agendei"
 msgid "Addressbook Conversion"
 msgstr "Convertire agendă"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Interfaţă"
 
@@ -671,368 +610,368 @@ msgstr "Adresse comună:"
 msgid "Personal address"
 msgstr "Adresse personală:"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Informaţie"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Eroare"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Creare dialog de avertisment...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Acest mesaj va apărea şi data viitoare"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Portocaliu"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Roşu"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Roz"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Albastru Cer"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Albastru"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Maro"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Adăugare..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fişier/_Salvare ca..."
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mesaj/Tr_imitere mai târziu"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mesaj/Sal_vare"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Message/Salvare şi _continuare"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Fişier/_Ataşare fişier"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Fişier/_Inserare fişier"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fişier/Inserare sem_nătură"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulare"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Repetare"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Tăiere"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:483
+#: src/compose.c:479
 #, fuzzy
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/Li_pire"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Select_are tot"
 
-#: src/compose.c:486
+#: src/compose.c:482
 #, fuzzy
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editare/An_ulare"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr ""
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr ""
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr ""
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr ""
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr ""
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr ""
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr ""
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr ""
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr ""
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr ""
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr ""
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr ""
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr ""
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:560
+#: src/compose.c:556
 #, fuzzy
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Tăie_re linii lungi"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Vedere"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Vedere/_La"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Vedere/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Vedere/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Vedere/_Răspuns"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Vedere/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Vedere/_Urmare"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Vedere/Ri_glă"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Vedere/_Ataşamente"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agendă"
 
-#: src/compose.c:577
+#: src/compose.c:573
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Utilitare/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editare/Editare cu un editor e_xtern"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/E_xecutare"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Message/Cr_iptare"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fişierul nu există\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 #, fuzzy
 msgid "Can't get text part\n"
 msgstr "xover imposibil\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citaţiei."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Eroare de formatare a răspunsului/mesajului înaintat."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fişierul %s nu există\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Obţinerea dimensiunii fişierului %s este imposibilă\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Fişierul %s este gol\n"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "nu poate fi creat %s\n"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Editat] "
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Compunere mesaj%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Trimitere"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "nu pot obţine lista destinatarilor."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1040,26 +979,26 @@ msgstr ""
 "Nu a fost specificat contul de pe care se doreşte trimiterea de mail.\n"
 "Vă rugăm să selectaţi un cont înainte de a trimite."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Salvarea mesajului în outbox este imposibilă."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fişierului este imposibilă\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1067,140 +1006,140 @@ msgid ""
 "Send it anyway?"
 msgstr "Convertirea codificării mesajului este imposibilă."
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "scrierea antetelor este imposibilă\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "ştergerea mesajului vechi a eşuat\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "punere mesaj în lista de aşteptare...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "punerea mesajului în lista de aşteptare este imposibilă\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tip MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Punere în lista de aşteptare şi trimitere mai târziu"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Salvare"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Salvare"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Inserare"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Isertion fişier"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Ataşament"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Ataşare fişier"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Inserare semnătură"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Tăiere linii"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Fişierul nu există sau este gol."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Numele fişierului"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1211,67 +1150,67 @@ msgstr ""
 "Doriţi terminarea forţată a procesului ?\n"
 "process group id: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Procesul a fost terminat: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fişier temporar: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Compunere: introducere din proces monitorizat\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Scrierea în fişier este imposibilă\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Citirea din pipe a eşuat\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Este imposibilă punerea mesajului în lista de aşteptare."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Selectare fişier"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Anulare mesaj"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Acest mesaj a fost modificat. Doriţi sa anulaţi schimbările ?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Anulare schimbări"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "Salvare"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 #, fuzzy
 msgid "Apply template"
 msgstr "Ştergere mesaj"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 #, fuzzy
 msgid "Replace"
 msgstr "/_Utilitare/_Modele"
@@ -1280,77 +1219,76 @@ msgstr "/_Utilitare/_Modele"
 msgid "Edit address"
 msgstr "Editare adresă"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Adăugare Persoană"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Editare Detalii Personale"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "O adresa E-Mail trebuie specificată."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Un Nume şi o Valoare trebuiesc specificate."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Editare Date Personale"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Nume Afişat"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Nume"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Prenume"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Poreclă"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Adresă E-Mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Sus"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Jos"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Modificare"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Ştergere"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Valoare"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Date Generale"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atribute Utilizator"
 
@@ -1366,7 +1304,7 @@ msgstr "Fişierul nu pare a fi o agendă validă."
 msgid "Could not read file."
 msgstr "Fişierul nu a putut fi citit."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Editare Agendă"
 
@@ -1379,7 +1317,7 @@ msgstr " Verificare Fişier "
 msgid "File"
 msgstr "Fişier"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Adăugare agendă"
 
@@ -1411,32 +1349,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Adrese Disponibile"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mutaţi Adresele E-Mail din sau în Grup cu ajutorul butoanelor săgeţi"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Editare Detalii de Grup"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Adăugare Grup"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Editare director"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -1448,11 +1386,11 @@ msgstr "Fişierul nu pare a fi în format JPilot."
 msgid "Select JPilot File"
 msgstr "Selectare Fişier JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Editare Înregistrare JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1461,7 +1399,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Adrese E-Mail adiţionale"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Adaugare Înregistrare JPilot"
 
@@ -1469,63 +1407,63 @@ msgstr "Adaugare Înregistrare JPilot"
 msgid "Connected successfully to server"
 msgstr "Conexiunea la server s-a soldat cu succes"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Conexiunea la server nu a putut fi realizată"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Editare server LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Testare Server "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Bază de Căutare"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Criterii de Căutare"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Resetare "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "DN-ul conexiunii"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Parola conexiunii"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (secs)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Număr Maxim de Înregistrări"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "General"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Avansat"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Adăugare Server LDAP"
 
@@ -1537,7 +1475,7 @@ msgstr "Editare LDAP - Selectare Bază de Căutare"
 msgid "Available Search Base(s)"
 msgstr "Baze de Căutare Disponibile"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Nu a fost posibilă citirea Bazei de Căutare de pe server - vă rugăm săo "
@@ -1551,11 +1489,11 @@ msgstr "Fişierul nu pare a fi în format vCard."
 msgid "Select vCard File"
 msgstr "Selectare Fişier vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Editare Înregistrare vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Adăugare Înregistrare vCard"
 
@@ -1584,10 +1522,10 @@ msgstr " Selectare... "
 msgid "Select exporting file"
 msgstr "Selectare fişier exportat"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configuraţie în fişier a eşuat\n"
 
@@ -1595,44 +1533,44 @@ msgstr "scrierea configuraţie în fişier a eşuat\n"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
@@ -1700,69 +1638,69 @@ msgstr "Necitit"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Setare informaţii despre director...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 #, fuzzy
 msgid "Rebuilding all folder trees..."
 msgstr "Rescanare directoare..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1772,16 +1710,16 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1790,25 +1728,25 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Ştergere director"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, fuzzy, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 #, fuzzy
 msgid "Empty all messages in trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1817,35 +1755,35 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -1877,10 +1815,6 @@ msgstr "Mesaje"
 msgid "Type"
 msgstr "Tip"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Împrospătare"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderat"
@@ -1893,15 +1827,15 @@ msgstr "doar citire"
 msgid "unknown"
 msgstr "necunoscut"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Gata."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroup-uri recepţionate (%s citite)"
@@ -1918,11 +1852,11 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere antet...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -2161,7 +2095,7 @@ msgstr "Numele Atributului"
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Selectare"
 
@@ -2185,7 +2119,7 @@ msgstr "Importare fişier LDIF în agendă"
 msgid "Prev"
 msgstr "Înapio"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Înainte"
 
@@ -2201,196 +2135,196 @@ msgstr "Atribute"
 msgid "Finish"
 msgstr "Terminare"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Recepţionare mesaje noi"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Aşteptaţi"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Recepţionare"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ştergere mesaje de pe server după primire"
 
-#: src/inc.c:535
+#: src/inc.c:536
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nu există mesaje necitite"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autorizarea a eşuat"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (secs)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d mesaje noui\n"
 
-#: src/inc.c:612
+#: src/inc.c:613
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nu există mesaje necitite"
 
-#: src/inc.c:621
+#: src/inc.c:622
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc un număr de erori la recepţionarea poştei."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "recepţionare mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recepţionare mesaje noi"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Încercarea de conectare la serverul POP3 a eşuat: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Recepţionarea numărului de mesaje noi"
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Recepţionarea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Recepţionarea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Recepţionarea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Ştergere mesaj"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Închidere conexiune"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ştergere mesaje de pe server după primire"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Nu mai este spaţiu pe disc."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 #, fuzzy
 msgid "Can't write file."
 msgstr "Scrierea în fişier este imposibilă.\n"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 #, fuzzy
 msgid "Socket error."
 msgstr "eroare de protocol\n"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Setări căsuţă poştală"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Setări căsuţă poştală"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentificare..."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autentificare..."
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Recepţionare mesaje noi pentru %s în %s...\n"
@@ -2408,7 +2342,7 @@ msgstr "Introducere parolă"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2417,11 +2351,11 @@ msgstr ""
 "Fişierul '%s' există deja.\n"
 "Directorul nu poate fi creat."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread nu este suportat de glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2430,84 +2364,84 @@ msgstr ""
 "GnuPG nu este instalat corect.\n"
 "Suportul pentru OpenPGP a fost dezactivat."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPŢIUNE]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresă]    deschidere fereastră de compunere"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recepţionare mesaje noi"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          recepţionare mesaje noi pentru toate conturile"
 
-#: src/main.c:411
+#: src/main.c:429
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status              afişare număr total de mesaje"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afişare ajutor şi ieşire"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              afişare versiune şi ieşire"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Fereastra de compunere de mesaje există.\n"
 "Sunteţi sigur că doriţi sa ieşiţi ?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Mesaje în lista de aşteptare"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Exista mesaje netrimise în lista de aşteptare. Doriţi sa ieşiţi ?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează o alta sesiune Sylpheed.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Scriere configuraţia filtrului...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3267,58 +3201,58 @@ msgstr "/_Ajutor/_Manual/_Engleză"
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Adăugare cutie poştală"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3328,16 +3262,16 @@ msgstr ""
 "Dacă este specificată o cutie poştală existentă, aceasta\n"
 "va fi scanată automat."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poştală '%s' există deja."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie poştală"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3347,147 +3281,147 @@ msgstr ""
 "Probabil că anumite fişiere există deja, sau nu aveţi permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Recepţionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Recepţionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Răspuns"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Răspunde la mesaj"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Răspuns toţi"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Răspunde la toţi"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Înaintare"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Înaintare mesaj"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Ştergere mesaj"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Execută toate procesele marcate"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Următorul mesaj necitit"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Preferinţe"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Setări cont curent"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Ieşire"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Doriţi să părăsiţi acest program ?"
 
@@ -3590,10 +3524,6 @@ msgstr "Distincţie minuscule/majuscule"
 msgid "Backward search"
 msgstr "Căutare înapoi"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Căutare"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Căutarea a eşuat"
@@ -3620,28 +3550,28 @@ msgstr "Căutarea a luat sfârşit"
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Salvare ca"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Suprascriere"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Doriţi suprascrierea fişierului existent ?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3650,7 +3580,7 @@ msgstr ""
 "Introduceţi linia de comandă pentru imprimare:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3711,7 +3641,7 @@ msgstr "Creare vedere MIME...\n"
 msgid "MIME Type"
 msgstr "Tip MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 #, fuzzy
 msgid "Text"
 msgstr "Înainte"
@@ -3724,16 +3654,16 @@ msgstr "Ataşamente"
 msgid "Select \"Check signature\" to check"
 msgstr ""
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Salvarea părţii selectate din mesajul multipart este imposibilă."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 #, fuzzy
 msgid "Open with"
 msgstr "La ieşire"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, fuzzy, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3742,7 +3672,7 @@ msgstr ""
 "Introduceţi linia de comandă pentru imprimare:\n"
 "('%s' va fi înlocuit cu numele fişierului)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Linia de comanda pentru vizualizare MIME este invalidă: '%s'"
@@ -3851,15 +3781,15 @@ msgstr "A avut loc o eroare la postare\n"
 msgid "Error occurred while sending command\n"
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr ""
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr ""
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3868,81 +3798,77 @@ msgid ""
 "(%.*s)\n"
 msgstr ""
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr ""
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Eroare de recepţionare timestamp APOP\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Eroare de sintaxă timestamp\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Eroare protocol POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "linie xover invalidă: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, fuzzy, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, fuzzy, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: src/pop.c:660
+#: src/pop.c:655
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "Setări căsuţă poştală"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 #, fuzzy
 msgid "can't start TLS session\n"
 msgstr "salvarea mesajului este imposibilă\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 #, fuzzy
 msgid "error occurred on authentication\n"
 msgstr "a avut loc o eroare la autorizaţie\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Commandă"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "a avut loc o eroare la autorizaţie\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Găsit: %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Configuraţia a fost salvată.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Aplicare"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Deschidere fereastră de configurare cont...\n"
@@ -3965,11 +3891,11 @@ msgstr "Preferinţe comune"
 msgid "Creating account preferences window...\n"
 msgstr "Creare fereastră de preferinţe cont...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Recepţionare"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr ""
 
@@ -4082,7 +4008,7 @@ msgstr "Recepţionare toate mesajele de pe server"
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -4104,7 +4030,7 @@ msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 msgid "Authentication method"
 msgstr "Autentificare..."
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4112,7 +4038,7 @@ msgstr "Automat"
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Antet"
 
@@ -4128,7 +4054,7 @@ msgstr "Generare Message-ID"
 msgid "Add user-defined header"
 msgstr "Adăugare de câmpuri definite de utilizator"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Editare..."
 
@@ -4334,22 +4260,22 @@ msgid ""
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Scriere configuraţia filtrului...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 #, fuzzy
 msgid "Menu name:"
 msgstr "Nume complet"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 #, fuzzy
 msgid "Command line:"
 msgstr "Commandă"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4371,47 +4297,47 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "/_Utilitare/_Modele"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr ""
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 #, fuzzy
 msgid "Registered actions"
 msgstr "Reguli înregistrate"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nou)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 #, fuzzy
 msgid "Menu name is not set."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 #, fuzzy
 msgid "Command line not set."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4419,96 +4345,96 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 #, fuzzy
 msgid "Delete action"
 msgstr "Ştergere cont"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 #, fuzzy
 msgid "Do you really want to delete this action?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont ?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Creare fereastră de preferinţe comune...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Preferinţe comune"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 #, fuzzy
 msgid "Quote"
 msgstr "Lista de aşteptare"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Afişare"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Mesaj"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Altele"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Program extern"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Foloseşte un program extern pentru incorporare"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Commandă"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Spool local"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Incorporare din spool"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrare la incorporare"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Verificare automată a poştei"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 #, fuzzy
 msgid "every"
 msgstr "Server"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Verificare poştă la pornire"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 #, fuzzy
 msgid "Update all local folders after incorporation"
 msgstr "Foloseşte un program extern pentru incorporare"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 #, fuzzy
 msgid ""
 "Maximum number of articles to download\n"
@@ -4517,580 +4443,580 @@ msgstr ""
 "Numărul maxim al articolului\n"
 "pentru recepţionare (0 = nelimitat)     "
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Folosire program extern pentru trimitere"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 #, fuzzy
 msgid "Save sent messages to outbox"
 msgstr "Salvare mesaje trimise în outbox"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Set de caractere"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr ""
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Vest European (ISO-8859-1)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcesc (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Chirilic (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Chirilic (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Chirilic (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Chirilic (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonez (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonez (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonez (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinezesc Simplificat (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinezesc Tradiţional (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinezesc Tradiţional (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinezesc"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Corean"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
 msgstr ""
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Separator de semnătură"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 #, fuzzy
 msgid "Insert automatically"
 msgstr "Inserează semnătura automat"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 #, fuzzy
 msgid "Automatically launch the external editor"
 msgstr "Editare cu editor extern"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "caractere"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Taie liniile semnăturii"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 #, fuzzy
 msgid "Wrap on input"
 msgstr "Tăiere toate liniile lungi"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Taie liniile înainte de trimitere"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 #, fuzzy
 msgid "Automatically select account for replies"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citează mesajul la care se răspunde"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Răspunde _la toţi"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 #, fuzzy
 msgid "Reply format"
 msgstr "Răspunde la toţi"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Semn de citare"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 #, fuzzy
 msgid "Forward format"
 msgstr "Înaintare"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Descrierea simbolurilor "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducere antet (cu ar fi 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Afişare număr de mesaje necitite lângă numele directorului"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 #, fuzzy
 msgid "letters"
 msgstr "Ştergere"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 #, fuzzy
 msgid "Summary View"
 msgstr "/Re_zumat"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Destinatarul pe coloana 'From', daca sunteţi expeditorul"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 #, fuzzy
 msgid "Date format"
 msgstr "Format de citare:"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Elemente afişate... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Colorare mesaje"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Afişare caractere pe 2 biţi cu un alfabet pe 1 bit"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 #, fuzzy
 msgid "Display header pane above message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Afişare antet scurt"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Spaţiere linii"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 #, fuzzy
 msgid "Automatically check signatures"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr ""
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 #, fuzzy
 msgid "Expired after"
 msgstr "Mai târziu"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 #, fuzzy
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
 msgstr ""
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr ""
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "un mesaj nu a putut fi recepţionat\n"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Deschide primul mesaj necitit la intrarea într-un director"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Mesaj/Desc_hidere în fereastră nouă"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr ""
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
 msgstr ""
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Recepţionare"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr ""
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 #, fuzzy
 msgid "Always"
 msgstr "Alias"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr ""
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Editor extern (%s va fi înlocuit de numele fişierului)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "La ieşire"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Confirmare ieşire"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 #, fuzzy
 msgid "Empty trash on exit"
 msgstr "Curăţare gunoi"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 #, fuzzy
 msgid "Ask before emptying"
 msgstr "Întreabă înainte de curăţare"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 #, fuzzy
 msgid "Warn if there are queued messages"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 #, fuzzy
 msgid "Specifier"
 msgstr "Selectare fişier"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 #, fuzzy
 msgid "Description"
 msgstr "Destinaţie"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr ""
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 #, fuzzy
 msgid "Set message colors"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 #, fuzzy
 msgid "Colors"
 msgstr "Închidere"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr ""
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr ""
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr ""
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr ""
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr ""
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr ""
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr ""
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5114,11 +5040,11 @@ msgstr ""
 "Message-ID\n"
 "Semnul %"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5127,7 +5053,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5135,48 +5061,48 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Selectare font"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr ""
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 #, fuzzy
 msgid "Default"
 msgstr "Ştergere"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr ""
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr ""
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr ""
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 #, fuzzy
 msgid "Delete header"
 msgstr "Ştergere director"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 #, fuzzy
 msgid "Do you really want to delete this header?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
@@ -5186,159 +5112,159 @@ msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 msgid "Creating display header setting window...\n"
 msgstr "Creare fereastră antet...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 #, fuzzy
 msgid "Display header setting"
 msgstr "/Afişare ca te_xt"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 #, fuzzy
 msgid "Header name"
 msgstr "Antet"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 #, fuzzy
 msgid "Displayed Headers"
 msgstr "Nume Afişat"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 #, fuzzy
 msgid "Hidden headers"
 msgstr "Antet"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 #, fuzzy
 msgid "Show all unspecified headers"
 msgstr "/_Afişare antet"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 #, fuzzy
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Citire configuraţie...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 #, fuzzy
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Scriere configuraţia filtrului...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 #, fuzzy
 msgid "This header is already in the list."
 msgstr "Directorul '%s' există deja."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 #, fuzzy
 msgid "Filter setting"
 msgstr "Filtrare"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "La:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Copiere..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Ştergere regulă"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Ştergere regulă"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Mesaj"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "conţine"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nu conţine"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5395,27 +5321,27 @@ msgstr "Executare"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Director"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresă"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Antet"
@@ -5601,7 +5527,7 @@ msgstr "Ştergere mesaj"
 msgid "Do you really want to delete this template?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 #, fuzzy
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Convertirea codului a eşuat.\n"
@@ -5625,11 +5551,11 @@ msgstr "Trimiterea mesajelor din lista de aşteptare a eşuat.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr ""
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Creare dialog de progres...\n"
 
@@ -5641,106 +5567,71 @@ msgstr "a apărut o eroare la recepţionarea datelor.\n"
 msgid "Can't write to file.\n"
 msgstr "Scrierea în fişier este imposibilă.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-#, fuzzy
-msgid "Oops: Signature not verified"
-msgstr "Fişier semnătură"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-#, fuzzy
-msgid "No signature found"
-msgstr "Nu a fost găsit nici un dicţionar\n"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-#, fuzzy
-msgid "Good signature"
-msgstr "Semnătură"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-#, fuzzy
-msgid "BAD signature"
-msgstr "Semnătură"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr ""
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr ""
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr ""
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr ""
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr ""
-
-#: src/rfc2015.c:175
-#, fuzzy, c-format
-msgid "BAD signature from \"%s\""
-msgstr "Semnătură"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr ""
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, fuzzy, c-format
 msgid "Signature made at %s\n"
 msgstr "Fişier semnătură"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
 msgstr ""
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, fuzzy, c-format
 msgid "Please select key for `%s'"
 msgstr "Selectaţi un fişier."
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, fuzzy, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Conectare la %s ..."
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 #, fuzzy
 msgid "Select Keys"
 msgstr "Selectare fişier"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 #, fuzzy
 msgid "Key ID"
 msgstr "Utilizator"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 #, fuzzy
 msgid "Val"
 msgstr "Valoare"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 #, fuzzy
 msgid "Add key"
 msgstr "Adăugare"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 #, fuzzy
 msgid "Enter another user or key ID:"
 msgstr "Utilizator"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Antetul mesajului din lista de aşteptare este invalid.\n"
@@ -5834,16 +5725,82 @@ msgstr ""
 "în format MH dacă aveţi una.\n"
 "Dacă nu sunteţi sigur, selectaţi OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 #, fuzzy
 msgid "Checking signature"
 msgstr "Inserare semnătură"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+#, fuzzy
+msgid "No signature found"
+msgstr "Nu a fost găsit nici un dicţionar\n"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:226 src/textview.c:529
+#, fuzzy
+msgid "Good signature"
+msgstr "Semnătură"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Fişier semnătură"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, fuzzy, c-format
+msgid "BAD signature from \"%s\""
+msgstr "Semnătură"
+
+#: src/sigstatus.c:249 src/textview.c:533
+#, fuzzy
+msgid "BAD signature"
+msgstr "Semnătură"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr ""
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr ""
@@ -6062,286 +6019,286 @@ msgstr "Nu."
 msgid "Creating summary view...\n"
 msgstr "Creare rezumat...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Procesare marcaje"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Au mai rămas nişte marcaje. Doriţi să fie procesate ?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Scanare director (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 #, fuzzy
 msgid "No more unread messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 #, fuzzy
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 #, fuzzy
 msgid "No unread messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 #, fuzzy
 msgid "Search again"
 msgstr "Căutarea a eşuat"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 #, fuzzy
 msgid "No new messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 #, fuzzy
 msgid "No more marked messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 #, fuzzy
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 #, fuzzy
 msgid "No marked messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 #, fuzzy
 msgid "No more labeled messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Atragere mesaje după subiect..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d şters(e)"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, fuzzy, c-format
 msgid "%s%d moved"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, fuzzy, c-format
 msgid "%s%d copied"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " elemente selectate"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sortare rezumat..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tDefinire rezumat din datele din mesaj..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Definire rezumat din datele din mesaj..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache rezumat (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Selectare toate mesajele..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Distrugere fire de discuţie pentru executare..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "mesajul %d a fost deja stocat.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, fuzzy, c-format
 msgid "file %s already exists\n"
 msgstr "Directorul '%s' există deja."
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Creare vedere text...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "un mesaj nu a putut fi recepţionat\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 #, fuzzy
 msgid "To save this part, pop up the context menu with "
 msgstr " Pentru salvare, activaţi meniul contextual cu\n"
 
-#: src/textview.c:595
+#: src/textview.c:613
 #, fuzzy
 msgid "right click and select `Save as...', "
 msgstr ""
@@ -6349,7 +6306,7 @@ msgstr ""
 " tasta 'y'.\n"
 "\n"
 
-#: src/textview.c:596
+#: src/textview.c:614
 #, fuzzy
 msgid ""
 "or press `y' key.\n"
@@ -6358,12 +6315,12 @@ msgstr ""
 " 'Afişare ca text' sau apăsaţi pe 't'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 #, fuzzy
 msgid "To display this part as a text message, select "
 msgstr " Pentru afişare ca mesaj text, selectaţi\n"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6371,34 +6328,34 @@ msgstr ""
 " 'Afişare ca text' sau apăsaţi pe 't'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 #, fuzzy
 msgid "To open this part with external program, select "
 msgstr " Pentru deschiderea cu un program extern, selectaţi 'Deschidere',\n"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr ""
 
-#: src/textview.c:603
+#: src/textview.c:621
 #, fuzzy
 msgid "or double-click, or click the center button, "
 msgstr " apăsaţi dublu-click sau click-mijloc, sau apasaţi 'l'."
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr ""
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr ""
 
-#: src/textview.c:623
+#: src/textview.c:641
 #, fuzzy
 msgid "To check it, pop up the context menu with\n"
 msgstr " Pentru salvare, activaţi meniul contextual cu\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 #, fuzzy
 msgid "right click and select `Check signature'.\n"
 msgstr ""
@@ -6406,7 +6363,7 @@ msgstr ""
 " tasta 'y'.\n"
 "\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6439,6 +6396,31 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eşuat.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Închidere"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulare"
+
+#~ msgid "No"
+#~ msgstr "Nu"
+
+#~ msgid "Refresh"
+#~ msgstr "Împrospătare"
+
+#~ msgid "Search"
+#~ msgstr "Căutare"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicare"
+
+#, fuzzy
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Fişier semnătură"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Etichetă gasită: %s\n"
 
diff --git a/po/ru.po b/po/ru.po
index cb26e7de..3828ecde 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "лицензии GNU; если этого не случилось, -- напишите в Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Чтение настроек учетных записей...\n"
@@ -115,11 +99,11 @@ msgstr ""
 "по команде 'Получить все'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Имя"
 
@@ -131,30 +115,30 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Добавить"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Изменить"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "Удалить"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Вниз"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Вверх"
@@ -163,13 +147,6 @@ msgstr "Вверх"
 msgid " Set as default account "
 msgstr " Установить учетную запись по умолчанию "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Закрыть"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Удалить учетную запись"
@@ -178,24 +155,15 @@ msgstr "Удалить учетную запись"
 msgid "Do you really want to delete this account?"
 msgstr "Вы действительно хотите удалить эту запись?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Да"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Нет"
 
@@ -241,29 +209,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Выполняется: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Завершено выполнение: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Ввод/вывод действия"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Отправить "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Прервать"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -274,11 +242,11 @@ msgstr ""
 "(он будет подставлен вместо '%%h'):\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Скрытый параметр действия"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -289,7 +257,7 @@ msgstr ""
 "(он будет подставлен вместо '%%u'):\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Пользовательский параметр действия"
 
@@ -297,13 +265,13 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Примечание"
 
@@ -311,24 +279,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Отменить"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/Файл"
@@ -349,8 +300,8 @@ msgstr "/Файл/Новый файл JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новый сервер"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -368,7 +319,7 @@ msgstr "/Файл/Удалить"
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
@@ -400,7 +351,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -409,12 +360,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -431,7 +382,7 @@ msgstr "/Новая группа"
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -441,7 +392,7 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Правка"
@@ -454,18 +405,18 @@ msgstr "/Удалить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Имя:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Удалить"
 
@@ -494,18 +445,6 @@ msgstr "Удалить адрес(а)"
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Нет"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -622,7 +561,7 @@ msgstr "Ошибка преобразования адресной книги"
 msgid "Addressbook Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -666,351 +605,351 @@ msgstr "Адреса организаций"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Создание окна предупреждения...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Показывать это сообщение в следующий раз"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Красный"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Розовый"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Голубой"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Синий"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Коричневый"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/Добавить..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/Файл/Отправить"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/Файл/Отправить позже"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Сохранить в папке черновиков"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Сохранить и продолжить правку"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/Файл/Вложить файл"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставить текст из файла"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Добавить подпись"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Правка/Откат"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Откат отката"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Правка/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Правка/Вырезать"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить все"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/Правка/Дополнительно"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Правка/Дополнительно/Перейти на символ назад"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Правка/Дополнительно/Перейти на символ вперед"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Правка/Дополнительно/Перейти на слово назад"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Правка/Дополнительно/Перейти на слово вперед"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Правка/Дополнительно/Перейти в начало строки"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Правка/Дополнительно/Перейти в конец строки"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Правка/Дополнительно/Перейти к предыдущей строке"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Правка/Дополнительно/Перейти к следующей строке"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Правка/Дополнительно/Удалить символ перед курсором"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Правка/Дополнительно/Удалить символ после курсора"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Правка/Дополнительно/Удалить предыдущее слово"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Правка/Дополнительно/Удалить следующее слово"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Правка/Дополнительно/Удалить строку"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Правка/Дополнительно/Удалить до конца строки"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Правка/Отформатировать абзац"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Правка/Отформатировать все сообщение"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Вид"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/Вид/Кому"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/Вид/Копия"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/Вид/Скрытая копия"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/Вид/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/Вид/Группы новостей для ответа"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/Вид/Линейка"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/Вид/Вложения"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Инструменты/Вызвать внешний редактор"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Инструменты/Подписать сообщение (PGP)"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Инструменты/Шифровать сообщение (PGP)"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Изменено]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Подготовка сообщения%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Отправить"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1018,26 +957,26 @@ msgstr ""
 "Учетная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите ее перед отправкой."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору '%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1048,138 +987,138 @@ msgstr ""
 "из %s в %s.\n"
 "Все равно послать его?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "ошибка записи заголовков\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Тип MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Вложить файл"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Добавить подпись"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Отформатировать все сообщение"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: '%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1190,66 +1129,66 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Завершен процесс группы: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Временный файл: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Подготовка сообщения: ввод из процесса слежения\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Не удалось запустить внешний редактор\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Ошибка записи в файл\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Ошибка чтения из канала\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Отказ от сообщения"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Это сообщение изменено. Отказаться от него?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Отказаться"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "В черновики"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон '%s'?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Заменить"
 
@@ -1257,77 +1196,76 @@ msgstr "Заменить"
 msgid "Edit address"
 msgstr "Редактирование адреса"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Новый контакт"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Редактирование сведений о контакте"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Необходимо указать адрес E-Mail."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Необходимо указать имя и значение."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Редактирование сведений о контакте"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Имя"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Псевдоним"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Адрес E-Mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Псевдоним"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Вверх"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Изменить"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Значение"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Основные сведения"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Пользовательские атрибуты"
 
@@ -1343,7 +1281,7 @@ msgstr "Файл не является допустимым файлом адр�
 msgid "Could not read file."
 msgstr "Ошибка чтения из файла."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Изменение адресной книги"
 
@@ -1356,7 +1294,7 @@ msgstr " Проверить файл "
 msgid "File"
 msgstr "Файл"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Добавление новой адресной книги"
 
@@ -1388,32 +1326,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Доступные адреса"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Используйте кнопки со стрелками для изменения списка адресов группы"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Добавление новой группы"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Изменить имя папки"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -1425,11 +1363,11 @@ msgstr "Указанный файл не в формате JPilot."
 msgid "Select JPilot File"
 msgstr "Выберите файл JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1438,7 +1376,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Дополнительные элементы адреса E-Mail"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Добавление новой записи JPilot"
 
@@ -1446,63 +1384,63 @@ msgstr "Добавление новой записи JPilot"
 msgid "Connected successfully to server"
 msgstr "Успешное подключение к серверу"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ошибка при подключении к серверу"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Настройка сервера LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Имя узла"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Порт"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Проверить сервер "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "База поиска"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Критерий поиска"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Сброс "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Полное имя для подключения"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Пароль для подключения"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Тайм-аут (сек)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Максимальный размер результата"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Основные"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Расширенные"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Добавление нового сервера LDAP"
 
@@ -1514,7 +1452,7 @@ msgstr "Настройка LDAP - Выбор базы поиска"
 msgid "Available Search Base(s)"
 msgstr "Доступные базы поиска"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Не удалось получить список баз поиска с сервера - установите базу вручную"
@@ -1527,11 +1465,11 @@ msgstr "Указанный файл не в формате vCard."
 msgid "Select vCard File"
 msgstr "Выбор файла vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Редактирование записи vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Добавление новой записи vCard"
 
@@ -1560,10 +1498,10 @@ msgstr " Выбор... "
 msgid "Select exporting file"
 msgstr "Выбор файла для экспорта"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "ошибка записи настроек в файл\n"
 
@@ -1571,41 +1509,41 @@ msgstr "ошибка записи настроек в файл\n"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
@@ -1666,64 +1604,64 @@ msgstr "Непрочитанные"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Перестройка всех деревьев папок ..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1733,16 +1671,16 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1751,24 +1689,24 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1777,34 +1715,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -1836,10 +1774,6 @@ msgstr "Статей"
 msgid "Type"
 msgstr "Тип"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Обновить"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "модерируемая"
@@ -1852,15 +1786,15 @@ msgstr "только чтение"
 msgid "unknown"
 msgstr "неизвестный"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Выполнено."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d групп новостей (%s загружено)"
@@ -1877,11 +1811,11 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -2114,7 +2048,7 @@ msgstr "Атрибут"
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Выбрать"
 
@@ -2138,7 +2072,7 @@ msgstr "Импорт файла LDIF в адресную книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Далее"
 
@@ -2154,133 +2088,133 @@ msgstr "Атрибуты"
 msgid "Finish"
 msgstr "Завершение"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Выполнено (нет новых сообщений)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учетной записи %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединение с сервером POP3: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Прием (принято сообщений: %d (%s))"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2289,27 +2223,27 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Не осталось места на диске."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2318,11 +2252,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2331,15 +2265,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Прием сообщений прерван\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -2357,7 +2291,7 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2366,11 +2300,11 @@ msgstr ""
 "Файл '%s' существует.\n"
 "Нельзя создать папку."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не поддерживается в glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2378,16 +2312,16 @@ msgstr ""
 "GnuPG установлен неправильно, или установлена устаревшая версия.\n"
 "Поддержка OpenPGP отключена."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно подготовки сообщения"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2397,24 +2331,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединенными\n"
 "                         файлами"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учетных записей"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2422,40 +2356,40 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть непосланные сообщения. Выходить?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Настройка действий"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3088,56 +3022,56 @@ msgstr "/Справка/FAQ/Итальянский"
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "Удалить все сообщения из всех корзин?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3147,16 +3081,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик '%s' уже существует."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3166,142 +3100,142 @@ msgstr ""
 "Может быть, некоторые файлы уже существуют, или вы не имеете прав на запись "
 "в каталоге."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Принять"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Получить новые сообщения"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Принять все"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Получить сообщения со всех учетных записей"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Послать сообщения из очереди"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Написать"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Написать новое сообщение"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Ответить"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Ответить на сообщение"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Ответить всем"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Переслать"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Переслать сообщение"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Удалить сообщение"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Учетная запись"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Настройка учетной записи"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щелкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щелкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
@@ -3404,10 +3338,6 @@ msgstr "Учитывать регистр"
 msgid "Backward search"
 msgstr "Обратный поиск"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Поиск"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Поиск не удался"
@@ -3432,28 +3362,28 @@ msgstr "Поиск закончен"
 msgid "Creating message view...\n"
 msgstr "Создание области просмотра сообщения...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Сохранить как"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Переписать"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Переписать существующий файл?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3462,7 +3392,7 @@ msgstr ""
 "Введите команду печати:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3522,7 +3452,7 @@ msgstr "Создание области просмотра MIME...\n"
 msgid "MIME Type"
 msgstr "Тип MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Текст"
 
@@ -3534,15 +3464,15 @@ msgstr "Вложения"
 msgid "Select \"Check signature\" to check"
 msgstr "Выберите \"Проверить подпись\" для проверки"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Ошибка при сохранении одного из компонентов сообщения."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Открыть с помощью"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3551,7 +3481,7 @@ msgstr ""
 "Введите команду открытия файла:\n"
 "('%s' будет заменено на имя файла)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Неверная команда просмотра MIME: '%s'"
@@ -3656,15 +3586,15 @@ msgstr "Произошла ошибка при отправке статьи\n"
 msgid "Error occurred while sending command\n"
 msgstr "Произошла ошибка при передаче команды.\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[нет идентификатора пользователя]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3677,7 +3607,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3685,70 +3615,66 @@ msgstr ""
 "Неверно! Повторите...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "В сообщении сервера не найдена требуемая метка времени APOP\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Ошибка синтаксиса метки времени в сообщении сервера\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Ошибка протокола POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "неверный ответ UIDL: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Удаление устаревшего сообщения %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропускается сообщение %d (%d байт)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "почтовый ящик занят\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "время сеанса истекло\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "не удалось начать сеанс TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "ошибка при аутентификации\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "команда не поддерживается\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "ошибка сеанса POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Найдено %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Применить"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Открытие окна настроек учетной записи...\n"
@@ -3770,11 +3696,11 @@ msgstr "Настройки учетной записи"
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учетной записи...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Прием"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Защита"
 
@@ -3883,7 +3809,7 @@ msgstr "Принимать все сообщения с сервера"
 msgid "Receive size limit"
 msgstr "Ограничить размер принимаемых сообщений"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "кб"
 
@@ -3903,7 +3829,7 @@ msgstr "(Неотфильтрованные сообщения будут сох
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -3911,7 +3837,7 @@ msgstr "Автоматически"
 msgid "`Get all' checks for new messages on this account"
 msgstr "Проверять по команде 'Получить все'"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Заголовок"
 
@@ -3927,7 +3853,7 @@ msgstr "Создавать Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Определить... "
 
@@ -4122,19 +4048,19 @@ msgstr ""
 "сообщений не рекомендуется. Этот формат не соответствует\n"
 "RFC 3156 - MIME Security with OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Настройка действий"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Название в меню:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Команда:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4174,43 +4100,43 @@ msgstr ""
 "   %h - параметр, задаваемый пользователем; не отображать текст при вводе\n"
 "   %s - выделенный текст"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Заменить "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Описание синтаксиса "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Зарегистрированные действия"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Новое)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Название в меню не указано."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Двоеточие ':' не допускается в тексте элемента меню."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Название действия для меню слишком длинное."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Не указана командная строка."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Название для меню и командная строка слишком длинные."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4220,91 +4146,91 @@ msgstr ""
 "Синтаксическая ошибка в команде:\n"
 "%s"
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Удалить действие"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Вы действительно хотите удалить это действие?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Создание окна общих настроек...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Общие настройки"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Цитирование"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Отображение"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Другое"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Внешняя программа"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Использовать внешнюю программу для приема"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Локальный спул"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Принимать из спула"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Фильтровать при приеме"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Путь к спулу"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Проверять приход новых сообщений"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "каждые"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "минут"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Проверять приход новых сообщений при запуске"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Обновить все локальные папки после приема"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Новости"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4312,115 +4238,115 @@ msgstr ""
 "Наибольшее число статей для загрузки\n"
 "(не ограничено, если указан 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Использовать внешнюю программу для отправки"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Сохранять отправленные сообщения в папке \"Отправленные\""
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Кодировка отправляемых сообщений"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Автоматически (Рекомендуется)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 бит ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропейская (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Центральноевропейская (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийская (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийская (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Русская (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кириллица Win (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Украинская (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Упрощенная китайская (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционная китайская (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционная китайская (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4428,11 +4354,11 @@ msgstr ""
 "При выборе варианта 'Автоматически' будет использована\n"
 "оптимальная кодировка для текущего языка и страны."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Кодирование текста сообщений"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4440,115 +4366,115 @@ msgstr ""
 "Укажите метод кодирования текстов сообщений, содержащих символы\n"
 "не из диапазона ASCII (Content-Transfer-Encoding)."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Разделитель подписи"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Добавлять автоматически"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Автоматически запускать внешний редактор"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Число уровней отката"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Переносить строки с"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "символа"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Переносить цитаты"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Переносить при вводе"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Переносить перед отправкой"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Автоматически выбирать учетную запись при ответе"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Цитировать при ответе"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "По кнопке \"Ответить\" отвечать в список рассылки"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Формат ответа"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Знак цитаты"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Формат пересылаемого сообщения"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Описание символов "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Переводить имена заголовков ('From:', 'Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Показывать число непрочитанных сообщений рядом с именем папки"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Сокращать названия групп новостей длиннее"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "букв"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Список сообщений"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показывать получателя в колонке 'От', если отправитель - Вы"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "Установить показываемые поля..."
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Разрешить раскраску сообщений"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4556,63 +4482,63 @@ msgstr ""
 "Отображать многобайтовые алфавитно-цифровые символы\n"
 "как ASCII (только для японских кодировок)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовков над областью просмотра сообщений"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Показывать сокращенные заголовки при просмотре сообщений"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "пикселей"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабировать присоединенные изображения по размеру окна"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Автоматически проверять подписи"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Показывать результат проверки подписи в отдельном окне"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Сохранять парольную фразу в памяти"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Удалять через"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "минут"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4620,35 +4546,35 @@ msgstr ""
 "(При установке в 0 парольная фраза будет храниться\n"
 " в течение всего сеанса)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Захватить ввод при запросе пароля"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приема новых сообщений"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4656,216 +4582,216 @@ msgstr ""
 "(Сообщения будут просто помечены до выполнения, если\n"
 " эта опция не включена)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Окно приема сообщений"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Показывать окно приема сообщений"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Всегда"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Только при ручном запуске приема"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Никогда"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Не отображать сообщение об ошибке при получении сообщений"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Закрывать окно приема сообщений после завершения"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Внешние команды (%s будет заменен на имя файла/URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Добавлять адрес в список адресатов по двойному щелчку"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Подтверждение при выходе"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Очищать корзину при выходе"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Спрашивать перед очисткой"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии сообщений в очереди"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Время ожидания ответа из сети:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "сокращенное название дня недели"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "сокращенное название месяца"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4889,11 +4815,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4907,7 +4833,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ '%'"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4919,15 +4845,15 @@ msgstr ""
 "Символ '{'\n"
 "Символ '}'"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Выбор шрифта"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4938,31 +4864,31 @@ msgstr ""
 "нажмите эту клавишу (или комбинацию клавиш), установив указатель\n"
 "на нужную команду в меню."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Старая Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Настройка дополнительных заголовков"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Дополнительные заголовки"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Имя заголовка не указано."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Удалить заголовок"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Удалить этот заголовок?"
 
@@ -4970,143 +4896,143 @@ msgstr "Удалить этот заголовок?"
 msgid "Creating display header setting window...\n"
 msgstr "Создание окна настройки заголовков...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Настройка отображения заголовков"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Название заголовка"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Выведенные заголовки"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Скрытые заголовки"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Показывать все неперечисленные заголовки"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Чтение конфигурации отображения заголовков...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Запись конфигурации отображения заголовков...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Этот заголовок уже присутствует в списке."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Настройка фильтров"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Вкл."
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "В начало"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "В конец"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Удаление правила"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Вы хотите удалить правило?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Правило фильтрации"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Если любое из следующих условий выполняется:"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Если все следующие условия выполняются:"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Выполнить следующие действия:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "To или Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Любой заголовок"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Изменить заголовки..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Тело сообщения"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Результат команды"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Возраст сообщения"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "содержит"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "не содержит"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "совпадает с"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "не совпадает с"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "соответствует regex"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "не соответствует regex"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "больше, чем"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "меньше, чем"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "больше, чем"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "меньше, чем"
 
@@ -5154,23 +5080,23 @@ msgstr "Выполнить команду"
 msgid "Stop rule evaluation"
 msgstr "Прекратить обработку правил"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "папку:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "адрес:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Список заголовков"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Заголовки"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Заголовок:"
 
@@ -5336,7 +5262,7 @@ msgstr "Удалить шаблон"
 msgid "Do you really want to delete this template?"
 msgstr "Удалить этот шаблон?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
@@ -5359,11 +5285,11 @@ msgstr "Ошибка при отправке сообщения %d из очер
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: '%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Состояние"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Создание диалогового окна прогресса...\n"
 
@@ -5375,97 +5301,66 @@ msgstr "произошла ошибка при получении данных.\
 msgid "Can't write to file.\n"
 msgstr "Ошибка записи в файл.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Подпись не проверена"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Подпись не найдена"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Хорошая подпись"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "ПЛОХАЯ подпись"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Нет ключа для проверки подписи"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Ошибка проверки подписи"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Разные результаты проверки подписей"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Ошибка: Неизвестный статус"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Хорошая подпись от \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "ПЛОХАЯ подпись  от \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Не найден идентификатор пользователя для этого ключа."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "        другое имя \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Подпись создана %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Отпечаток ключа: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Ошибка проверки подписи"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Выберите ключ для '%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Сбор информации о '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Выбор ключа"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID ключа"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Добавить ключ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Введите другой идентификатор ключа или пользователя:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок сообщения в очереди испорчен.\n"
@@ -5553,15 +5448,78 @@ msgstr ""
 "если у вас есть таковой.\n"
 "Если не уверены, то просто нажмите OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Проверка подписи"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s от \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Подпись не найдена"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Хорошая подпись от \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Хорошая подпись"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Подпись создана %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "ПЛОХАЯ подпись  от \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "ПЛОХАЯ подпись"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Нет ключа для проверки подписи"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "Аутентификация SMTP недоступна\n"
@@ -5764,255 +5722,255 @@ msgstr "Номер"
 msgid "Creating summary view...\n"
 msgstr "Создание области просмотра списка...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Обработка меток"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Несколько меток осталось. Обработать их?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удаленное\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Уничтожение повторяющихся сообщений..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Выбираются все сообщения..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Отмена связывания обсуждения для исполнения..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s уже существует\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Создание области просмотра текста...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Чтобы сохранить эту часть, вызовите контекстное меню, "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "щелкнув правой кнопкой мыши, и выберите 'Сохранить как...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6020,11 +5978,11 @@ msgstr ""
 "или нажмите клавишу 'y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Для отображения этого вложения как текста выберите "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6032,35 +5990,35 @@ msgstr ""
 "'Показать как текст', или нажмите клавишу 't'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Для открытия этого вложения внешней программой выберите "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "'Открыть' или 'Открыть с помощью...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "или щелкните дважды, или щелкните средней кнопкой мыши, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "или нажмите клавишу 'l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Эта подпись еще не была проверена.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Чтобы проверить ее, вызовите контекстное меню, щелкнув правой\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "кнопкой мыши, и выберите 'Проверить подпись'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6096,6 +6054,42 @@ msgstr "%.2f Гб"
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Закрыть"
+
+#~ msgid "Cancel"
+#~ msgstr "Отменить"
+
+#~ msgid "No"
+#~ msgstr "Нет"
+
+#~ msgid "Refresh"
+#~ msgstr "Обновить"
+
+#~ msgid "Search"
+#~ msgstr "Поиск"
+
+#~ msgid "Apply"
+#~ msgstr "Применить"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Подпись не проверена"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Разные результаты проверки подписей"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Ошибка: Неизвестный статус"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "        другое имя \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Отпечаток ключа: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Найдена метка: %s\n"
 
diff --git a/po/sk.po b/po/sk.po
index ad469366..d06d9449 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -64,22 +64,6 @@ msgstr ""
 "programom. Ak to tak nie je, napíšte na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Načítavam nastavenia pre všetky kontá...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Meno"
 
@@ -129,30 +113,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Pridať"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Upraviť"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "Zmazať"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Nadol"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Nahor"
@@ -161,13 +145,6 @@ msgstr "Nahor"
 msgid " Set as default account "
 msgstr "Nastaviť ako východzie konto"
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zavrieť"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Zmazať konto"
@@ -176,24 +153,15 @@ msgstr "Zmazať konto"
 msgid "Do you really want to delete this account?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Áno"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nie"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Spustené: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Vstup/výstup akcie"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Odoslať "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Ukončiť"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,11 +240,11 @@ msgstr ""
 "(`%%h' bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľský parameter pre akciu"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -287,7 +255,7 @@ msgstr ""
 "(`%%h' bude nahradené parametrom)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Používateľský parameter pre akciu"
 
@@ -295,13 +263,13 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -309,24 +277,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Storno"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Súbor"
@@ -347,8 +298,8 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -366,7 +317,7 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
@@ -398,7 +349,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -407,12 +358,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -429,7 +380,7 @@ msgstr "/Nová _Skupina"
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -439,7 +390,7 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Upraviť"
@@ -452,18 +403,18 @@ msgstr "/Z_mazať"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Meno:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -492,18 +443,6 @@ msgstr "Zmazať adresu(y)"
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nie"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -621,7 +560,7 @@ msgstr "Chyba pri konverzii adresára"
 msgid "Addressbook Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Ovládanie"
 
@@ -665,359 +604,359 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Chyba"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Vytváram dialóg pre varovania...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Zobraziť túto správu nabudúce"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Červená"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Ružová"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Bledomodrá"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zelená"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Hnedá"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/R_ozšírené"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dozadu"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dopredu"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dozadu"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dopredu"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na začiatok riadku"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na koniec riadku"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na predchodzí riadok"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na ďalší riadok"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak naľavo od kurzora"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak napravo od kurzora"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo naľavo od kurzora"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo napravo od kurzora"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať text do konca riadku"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr "[Upravené]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1025,26 +964,26 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemôžem nájsť žiadny kľúč asociovaný so zvoleným ID kľúča `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1055,138 +994,138 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "nedá sa zapísať hlavička\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME typ"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1197,66 +1136,66 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ukončená skupina procesov s ID: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Dočasný súbor: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie: vstup z externého procesu\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Nedá sa spustiť externý editor\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Nedá sa zapisovať do súboru\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Nedá sa čítať z potrubia\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Zrušiť správu"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Zahodiť"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "medzi Koncepty"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Nahradiť"
 
@@ -1264,77 +1203,76 @@ msgstr "Nahradiť"
 msgid "Edit address"
 msgstr "Upraviť adresu"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Pridať kontakt"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Musíte zadať e-mailovú adresu."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Musíte zadať názov a hodnotu."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Krstné meno"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Prezývka"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Posunúť nahor"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Posunúť nadol"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Zmeniť"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Hodnota"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Základné údaje"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atribúty uživateľa"
 
@@ -1350,7 +1288,7 @@ msgstr "Súbor nemá platný formát adresára."
 msgid "Could not read file."
 msgstr "Súbor sa nedá čítať."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Upraviť adresár"
 
@@ -1363,7 +1301,7 @@ msgstr "Testovať súbor"
 msgid "File"
 msgstr "Súbor"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Pridať nový adresár"
 
@@ -1395,33 +1333,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy môžte presúvať z a do skupiny pomocou tlačítok so šípkami"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Upraviť priečinok"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -1433,11 +1371,11 @@ msgstr "Súbor nemá JPilot formát."
 msgid "Select JPilot File"
 msgstr "Vyberte súbor JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1446,7 +1384,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Ďalšie e-mailové adresy"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Pridať nový záznam JPilot"
 
@@ -1454,63 +1392,63 @@ msgstr "Pridať nový záznam JPilot"
 msgid "Connected successfully to server"
 msgstr "Pripojený k serveru"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Nepodarilo sa pripojiť k serveru"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Upraviť LDAP server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Názov počítača"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr "Overiť server"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Báza pre vyhľadávanie"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Kritériá pre vyhľadávanie"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Reset "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind heslo"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (v sekundách)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Základné"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Rozšírené"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Pridať nový LDAP server"
 
@@ -1522,7 +1460,7 @@ msgstr "Úprava LDAP - Zvoľte bázu pre vyhľadávanie"
 msgid "Available Search Base(s)"
 msgstr "Dostupné bázy"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 "Nemôžem načítať bázy pre vyhľadávanie zo servera - prosím zadajte ručne"
@@ -1535,11 +1473,11 @@ msgstr "Súbor nie je vo formáte vCard."
 msgid "Select vCard File"
 msgstr "Vyberte súbor vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Upraviť vCard záznam"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Pridať nový vCard záznam"
 
@@ -1568,10 +1506,10 @@ msgstr "Zvoľte..."
 msgid "Select exporting file"
 msgstr "Zvoľte súbor pre export"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
 
@@ -1579,41 +1517,41 @@ msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -1676,64 +1614,64 @@ msgstr "Neprečítané"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Obnovujem strom všetkých priečinkov..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1743,16 +1681,16 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1761,24 +1699,24 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1787,34 +1725,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -1846,10 +1784,6 @@ msgstr "Správy"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Obnoviť"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderovaná"
@@ -1862,15 +1796,15 @@ msgstr "len na čítanie"
 msgid "unknown"
 msgstr "neznáma"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Hotovo."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
@@ -1887,11 +1821,11 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -2124,7 +2058,7 @@ msgstr "Názov atribútu"
 msgid "Attribute"
 msgstr "Atribút"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Zvoľte"
 
@@ -2148,7 +2082,7 @@ msgstr "Importovať súbor LDIF do adresára"
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -2164,134 +2098,134 @@ msgstr "Atribúty"
 msgid "Finish"
 msgstr "Dokončiť"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2300,27 +2234,27 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Chyba socketu."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2329,11 +2263,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2342,16 +2276,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -2369,7 +2303,7 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2378,11 +2312,11 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2390,16 +2324,16 @@ msgstr ""
 "GnuPG nie je nainštalované správne, alebo jeho verzia je príliš stará.\n"
 "Podpora OpenPGP je vypnutá."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2410,23 +2344,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2434,41 +2368,41 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3112,58 +3046,58 @@ msgstr "/Nápo_veda/_FAQ/_Taliansky"
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mením typ oddeľovača okien z %d na %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3173,16 +3107,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3192,144 +3126,144 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Prijať"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Prijať novú poštu"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Prijať všetko"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Odoslať správy vo fronte"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Napísať novú správu"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odpovedať na správu"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odp. všetkým"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Poslať správu ďalej"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Zmazať správu"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Ďalšia neprečítaná správa"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
@@ -3431,10 +3365,6 @@ msgstr "Záleží na veľkosti písmen"
 msgid "Backward search"
 msgstr "Hľadať dozadu"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Hľadať"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Hľadanie sa nepodarilo"
@@ -3459,28 +3389,28 @@ msgstr "Hľadanie dokončené"
 msgid "Creating message view...\n"
 msgstr "Vytváram zobrazenie správy...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Uložiť ako"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3489,7 +3419,7 @@ msgstr ""
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3549,7 +3479,7 @@ msgstr "Vytváram zobrazenie MIME...\n"
 msgid "MIME Type"
 msgstr "MIME typ"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Text"
 
@@ -3561,15 +3491,15 @@ msgstr "Prílohy"
 msgid "Select \"Check signature\" to check"
 msgstr "Zvoľte \"Overiť podpis\" pre overenie"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Nemôžem uložiť časť viacdielnej správy."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Otvoriť čím"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3578,7 +3508,7 @@ msgstr ""
 "Zadajte príkazový riadok pre otvorenie súboru:\n"
 "('%s' bude nahradené názvom súboru)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
@@ -3684,15 +3614,15 @@ msgstr "Pri odosielaní sa vyskytla chyba\n"
 msgid "Error occurred while sending command\n"
 msgstr "Pri odosielaní správy nastala chyba."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[žiadny user id]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3705,7 +3635,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3713,70 +3643,66 @@ msgstr ""
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdrave nebola nájdená vyžadovaná APOP časová značka\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Chybná časová značka v pozdrave\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Chyba protokolu POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Odstraňujem starú správu %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakujem správu %d (%d bajtov)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "mailbox je zamknutý\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "čas spojenia vypršal\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "nemôžem vytvoriť TLS reláciu\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "vyskytla sa chyba v autentizácii\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "príkaz nie je podporovaný\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Nájdené %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Použiť"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Otváram okno nastavenia konta...\n"
@@ -3798,11 +3724,11 @@ msgstr "Nastavenie konta"
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Súkromie"
 
@@ -3912,7 +3838,7 @@ msgstr "Prijať všetky správy na serveri"
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3932,7 +3858,7 @@ msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatická"
 
@@ -3940,7 +3866,7 @@ msgstr "Automatická"
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Hlavička"
 
@@ -3956,7 +3882,7 @@ msgstr "Generovať Message-ID"
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Upresniť... "
 
@@ -4151,19 +4077,19 @@ msgstr ""
 "v ASCII-armored formáte. Nevyhovuje totiž špecifikácii\n"
 "RFC 3156 - Bezpečnosť MIME s OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Nastavenie akcií"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Názov menu:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Príkazový riadok:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4203,43 +4129,43 @@ msgstr ""
 "   %h skrytý parameter zadaný používateľom\n"
 "   %s označený text"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Nahradiť "
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Nápoveda syntaxe "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrované akcie"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nové)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Nebol zadaný názov menu."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Bodkočiarka ':' nie je povolená v názve menu."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Názov menu je príliš dlhý."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Názov menu a príkazový riadok sú príliš dlhé."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4250,91 +4176,91 @@ msgstr ""
 "%s\n"
 "má syntaktickú chybu."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Zmazať akciu"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Vytváram okno všeobecných nastavení...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citát"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Zobrazenie"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Správa"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostatné"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Externý program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokálny spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Prijať lokálnu poštu zo spoolu"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrovať pri prijímaní lokálnej pošty"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Automaticky zisťovať novú poštu"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "každých"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minút"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4342,115 +4268,115 @@ msgstr ""
 "Maximálny počet príspevkov na stiahnutie\n"
 "(0 pre neobmedzený počet)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Uložiť odoslané správy"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4458,11 +4384,11 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
 "pre súčasnú lokalizáciu."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4470,178 +4396,178 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá,\n"
 "keď bude správa obsahovať iné znaky ako ASCII."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Vložiť automaticky"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Počet spätných krokov"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Zalomiť pred odoslaním"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automaticky zvoliť konto pri odpovedaní"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Pri odpovedaní citovať správu"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Formát odpovede"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Značka citácie"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Popis znakov "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Písmo"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "písmen"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Zoznam správ"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prispôsobiť veľkosť priložených obrázkov"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Zobraziť výsledok overenia ako upozornenie"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Vymazať z pamäte za"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minút "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4649,35 +4575,35 @@ msgstr ""
 "(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
 " až do ukončenia)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4685,216 +4611,216 @@ msgstr ""
 "(Správy budú označené až do vykonania,\n"
 " ak je táto možnosť vypnutá)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Okno prijímania"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "sekúnd"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4918,11 +4844,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4936,7 +4862,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4948,15 +4874,15 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Voľba písma"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4966,31 +4892,31 @@ msgstr ""
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Nastavenie vlastných hlavičiek"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Vlastné hlavičky"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
@@ -4998,149 +4924,149 @@ msgstr "Naozaj chcete zmazať túto hlavičku?"
 msgid "Creating display header setting window...\n"
 msgstr "Vytváram okno nastavenia zobrazovaných hlavičiek...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Názov hlavičky"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skryté hlavičky"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Zobraziť všetky neurčené hlavičky"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Načítavam nastavenie zobrazovania hlavičiek...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Zapisujem nastavenie zobrazovania hlavičiek...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Nastavenie filtra"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Prvé"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Posledné"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopírovať..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Zmazať pravidlo"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete zmazať toto pravidlo?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Zmazať pravidlo"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Skryté hlavičky"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Správa"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5197,27 +5123,27 @@ msgstr "Vykonať"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Priečinok"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresár"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Hlavička"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Hlavička"
@@ -5389,7 +5315,7 @@ msgstr "Zmazať šablónu"
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 
@@ -5412,11 +5338,11 @@ msgstr "Nepodarilo sa odoslať správu %d z fronty.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Stav"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Vytváram stavové okno...\n"
 
@@ -5428,97 +5354,66 @@ msgstr "pri prijímaní dát sa vyskytla chyba.\n"
 msgid "Can't write to file.\n"
 msgstr "Do súboru sa nedá zapisovať.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: Podpis nebol overený"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Nebol nájdený žiadny podpis"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Správny podpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "CHYBNÝ podpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nemôžem nájsť verejný kľúč pre overenie podpisu"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Chyba pri overovaní podpisu"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Rozdielne výsledky pre podpisy"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Chyba: Stav neznámy"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Správny podpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "CHYBNÝ podpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Nemôžem nájsť user ID pre tento kľúč."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpísané dňa %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Odtlačok kľúča: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Chyba pri overovaní podpisu"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Prosím zvoľte kľúč pre '%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Zhromažďujem informácie pre '%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Zvoľte kľúče"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Key ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Hodnota"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Pridať kľúč"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Zadajte ďalšie user alebo key ID:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Hlavička správy vo fronte je poškodená.\n"
@@ -5606,15 +5501,78 @@ msgstr ""
 "ak nejaký máte.\n"
 "Ak ste si nie istý, zvoľte len OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Overujem podpis"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Nebol nájdený žiadny podpis"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Správny podpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Správny podpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Podpísané dňa %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "CHYBNÝ podpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "CHYBNÝ podpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nemôžem nájsť verejný kľúč pre overenie podpisu"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH nie je dostupné\n"
@@ -5818,257 +5776,257 @@ msgstr "Č."
 msgid "Creating summary view...\n"
 msgstr "Vytváram zoznam správy...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Spracovať značky"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 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:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 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:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 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:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 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:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 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:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, 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:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Vyberám všetky správy."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Odstraňujem štruktúru vlákien pre vykonanie..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "súbor %s už existuje\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Vytváram zobrazenie textu...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Pre uloženie tejto časti, vyvolajte kontextové menu "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "pravým tlačítkom myši a vyberte 'Uložiť ako...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6076,11 +6034,11 @@ msgstr ""
 "alebo stlačte klávesu 'y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Pre zobrazenie tejto časti v podobe textovej správy, vyberte "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6088,35 +6046,35 @@ msgstr ""
 "'Zobraziť ako text', alebo stlačte klávesu 't'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Pre otvorenie tejto časti externým programom, vyberte "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "'Otvoriť' alebo 'Otvoriť čím...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "alebo kliknite dvakrát, alebo kliknite stredným tlačítkom myši, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "alebo stlačte klávesu 'l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Tento podpis ešte nebol overený.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Pre overenie, vyvolajte kontextové menu\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "pravým tlačítkom a vyberte 'Overiť podpis'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6149,6 +6107,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Zavrieť"
+
+#~ msgid "Cancel"
+#~ msgstr "Storno"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
+#~ msgid "Refresh"
+#~ msgstr "Obnoviť"
+
+#~ msgid "Search"
+#~ msgstr "Hľadať"
+
+#~ msgid "Apply"
+#~ msgstr "Použiť"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: Podpis nebol overený"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Rozdielne výsledky pre podpisy"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Chyba: Stav neznámy"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Odtlačok kľúča: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Nájdené návestie: %s\n"
 
diff --git a/po/sl.po b/po/sl.po
index f825314c..e330f294 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -64,22 +64,6 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "V redu"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak račun...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -129,30 +113,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Strežnik"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Urejanje"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Brisanje "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dol"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gor"
@@ -161,13 +145,6 @@ msgstr "Gor"
 msgid " Set as default account "
 msgstr " Nastavi kot privzet račun "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zapri"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Brisanje računa"
@@ -176,24 +153,15 @@ msgstr "Brisanje računa"
 msgid "Do you really want to delete this account?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Ne"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Teče: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Končano: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Vhod/izhod dejanja"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Pošlji "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Prekini"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -271,11 +239,11 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -285,7 +253,7 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -293,13 +261,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Opombe"
 
@@ -307,24 +275,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -345,8 +296,8 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -364,7 +315,7 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
@@ -396,7 +347,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -405,12 +356,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -427,7 +378,7 @@ msgstr "/Nova _skupina"
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -437,7 +388,7 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Urejanje"
@@ -450,18 +401,18 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Ime:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -490,18 +441,6 @@ msgstr "Brisanje naslova"
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ne"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -618,7 +557,7 @@ msgstr "Napaka pri pretvorbi imenika naslovov"
 msgid "Addressbook Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Vmesnik"
 
@@ -662,360 +601,360 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Napaka"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Delam pogovorno okno z alarmno ploščo...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Pokaži to sporočilo naslednjič"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Oranžna"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Rdeča"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rožnata"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Sinja"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Modra"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Rjava"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Uredi/_Napredno"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Uredi/_Napredno/Pojdi za znak nazaj"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Uredi/_Napredno/Pojdi za znak naprej"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Uredi/_Napredno/Pojdi za besedo nazaj"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Uredi/_Napredno/Pojdi za besedo naprej"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Uredi/_Napredno/Pojdi na začetek vrstice"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Uredi/_Napredno/Pojdi na konec vrstice"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Uredi/_Napredno/Pojdi v prejšnjo vrstico"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Uredi/_Napredno/Pojdi v naslednjo vrstico"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Uredi/_Napredno/Izbriši prejšnji znak"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Uredi/_Napredno/Zbriši naslednji znak"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Uredi/_Napredno/Izbriši prejšnjo besedo"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Uredi/_Napredno/Izbriši naslednjo besedo"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Uredi/_Napredno/Izbriši vrstico"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Uredi/_Napredno/Izbriši do konca vrstice"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporočilo%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1023,26 +962,26 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1052,139 +991,139 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "Ne morem zapisati zaglavij\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "Tip MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1195,66 +1134,66 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Št. prekinjene skupine procesov: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Začasna datoteka: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Zavrzi sporočilo"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Zavrži"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "v Draft"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Zamenjaj"
 
@@ -1262,77 +1201,76 @@ msgstr "Zamenjaj"
 msgid "Edit address"
 msgstr "Urejanje naslova"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Dodaj novo osebo"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Uredi podatke o osebi"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Elektronski naslov mora biti podan."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Ime in vrednost morata biti podana."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Urejanje podatkov o osebi"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Prikaži ime"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Priimek"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Vzdevek"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Elektronski Naslov"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Vzdevek"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Premakni navzgor"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Premakni navzdol"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Spremeni"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Počisti"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Vrednost"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Osnovni podatki"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Uporabniški atributi"
 
@@ -1348,7 +1286,7 @@ msgstr "Datoteka se ne zdi veljaven imenik naslovov."
 msgid "Could not read file."
 msgstr "Datoteke ni mogoće prebrati."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
@@ -1361,7 +1299,7 @@ msgstr " Preveri Datoteko "
 msgid "File"
 msgstr "Datoteka"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Dodaj nov imenik naslovov"
 
@@ -1393,32 +1331,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Razpoložljivi naslovi"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Prestavljate naslove v ali iz skupine s klikanjem na puščice"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Dodaj novo skupino"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Urejanje mape"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -1430,11 +1368,11 @@ msgstr "Kaže, da datoteka nima oblike JPilot."
 msgid "Select JPilot File"
 msgstr "Izberite datoteko JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1443,7 +1381,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Dodatni kos(i) elektronskega naslova"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Dodaj nov vnos JPilot"
 
@@ -1451,63 +1389,63 @@ msgstr "Dodaj nov vnos JPilot"
 msgid "Connected successfully to server"
 msgstr "Uspešna povezava s strežnikom"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ne morem se povezati s strežnikom"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Urejanje strežnika LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Vrata"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Preveri strežnik "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Iskanje v zbirki"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Kriteriji iskanja"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Ponastavi "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr " Ime domene Bind"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Geslo za Bind"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Čas izteka (sek.)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Razširjen"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Dodaj nov strežnik LDAP"
 
@@ -1519,7 +1457,7 @@ msgstr "Urejanje LDAP - Izberite bazo iskanja"
 msgid "Available Search Base(s)"
 msgstr "Razpoložljive baze iskanja"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Ne morem prebrati iskalnih baz s strežnika. Prosim, vnesite jih ročno"
 
@@ -1531,11 +1469,11 @@ msgstr "Datoteka se ne zdi veljaven zapis v-kartice."
 msgid "Select vCard File"
 msgstr "Izberite datoteko v-kartice"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Urejanje vnosa v-kartice"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Dodaj nov vnos v-kartice"
 
@@ -1564,10 +1502,10 @@ msgstr " Izberi... "
 msgid "Select exporting file"
 msgstr "Izberite datoteko za izvoziti"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
 
@@ -1575,41 +1513,41 @@ msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -1672,65 +1610,65 @@ msgstr "Neprebrano"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Ponovno gradim vsa drevesa map..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1740,16 +1678,16 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1758,24 +1696,24 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1784,34 +1722,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -1843,10 +1781,6 @@ msgstr "Sporočila"
 msgid "Type"
 msgstr "Tip"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Osveži"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderirano"
@@ -1859,15 +1793,15 @@ msgstr "samo za branje"
 msgid "unknown"
 msgstr "neznano"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Opravljeno."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d sprejetih novičarskih skupin (%s prebranih)"
@@ -1884,11 +1818,11 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -2126,7 +2060,7 @@ msgstr "Ime atributa"
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Izberi"
 
@@ -2150,7 +2084,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2166,189 +2100,189 @@ msgstr "Atributi"
 msgid "Finish"
 msgstr "Končaj"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporočil)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "napaka v priključku."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -2366,7 +2300,7 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2375,11 +2309,11 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread ni podprt v glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2387,16 +2321,16 @@ msgstr ""
 "GnuPG ni pravilno nameščen ali pa je različica prestara.\n"
 "Podpora za OpenPGP je izključena."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2406,64 +2340,64 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3113,58 +3047,58 @@ msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip ločevanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3174,16 +3108,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3192,144 +3126,144 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Pripoji novo pošto"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo pošto z vseh računov"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odgovori na sporočilo"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Posreduj sporočilo"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Izbriši sporočilo"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporočilo"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Račun"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Nastavitev računa"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
@@ -3431,10 +3365,6 @@ msgstr "Razlikuj velike in male črke"
 msgid "Backward search"
 msgstr "Iskanje nazaj"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Iskanje"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Iskanje neuspešno"
@@ -3459,28 +3389,28 @@ msgstr "Iskanje končano"
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporočila...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Shrani kot"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Povozi"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Naj povozim obstoječo datoteko"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3489,7 +3419,7 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3549,7 +3479,7 @@ msgstr "Ustvarjam izgled MIME...\n"
 msgid "MIME Type"
 msgstr "Tip MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Besedilo"
 
@@ -3561,15 +3491,15 @@ msgstr "Priloge"
 msgid "Select \"Check signature\" to check"
 msgstr "Izberite \"Preveri podpis\" za preverjanje"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Ne morem shraniti dela večdelnega sporočila."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Odpri z"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3578,7 +3508,7 @@ msgstr ""
 "Vnesite ukazno vrstico za odpiranje datoteke:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
@@ -3684,15 +3614,15 @@ 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."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Šifrirna fraza"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[ni uporabnikovega id]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3705,7 +3635,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3713,72 +3643,68 @@ msgstr ""
 "Napačna šifrirna fraza! Poskusite znova...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "V pozdravu ni bila najdena zahtevana časovna značka APOP\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Skladenjska napaka časovne značke v pozdravu\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Napaka v protokolu POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "neveljavna vrstica xover: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: brišem poteklo sporočilo %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Izpuščam sporočilo %d (%d zlogov)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "poštni predal je zaklenjen\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "ne morem pričeti seje TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Ukaz"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Najden %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Uporabi"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve računa...\n"
@@ -3800,11 +3726,11 @@ msgstr "Nastavitve računa"
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Zasebnost"
 
@@ -3914,7 +3840,7 @@ msgstr "Naloži vsa sporočila na strežniku"
 msgid "Receive size limit"
 msgstr "Omejitev dolžine pri sprejemanju"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3934,7 +3860,7 @@ msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -3942,7 +3868,7 @@ msgstr "Samodejno"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Poberi vsa' preveri novo pošto na tem računu"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Zaglavje"
 
@@ -3958,7 +3884,7 @@ msgstr "Generiran ID sporočila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4154,20 +4080,20 @@ msgstr ""
 "enkripcijo ni priporočljiva. Ni združljiv z\n"
 "RFC 3156 MIME Security z Open PGP"
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Ime menija:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Ukazna vrstica"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4203,44 +4129,44 @@ msgstr ""
 "   %F za seznam imen datotek izbranih sporočil\n"
 "   %p za del izbranega sporočila."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Zamenjaj"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Pomoč pri skladnji "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrirana dejanja"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Nov)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Ime menija ni nastavljeno."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dvopičje ':' ni dovoljeno v imenu menija."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Ime menija je predolgo."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Ime menija in ukaz sta predolga."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4251,91 +4177,91 @@ msgstr ""
 "%s\n"
 "je skladenjska napaka."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Izbriši dejanje"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Ustvarjam okno za splošne nastavitve...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Splošne nastavitve"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Sporočila"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Zunanji program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Uporabi zunanji program za vključitev"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokalni spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Pripoji iz spoola"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtriranje ob pripojitvi"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Samodejno preverjanje nove pošte"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "vsak"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Preveri novo pošto ob zagonu"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Posodobi vse lokalne mape po pripojitvi"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4343,115 +4269,115 @@ msgstr ""
 "Največje število člankov za nalaganje\n"
 "(neomejeno, če podate 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Shrani poslana sporočila v izhodno mapo"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Izhodni nabor znakov"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Samodejno (priporočeno)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitni ASCII (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Zahodnoevropski (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevropski (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4459,126 +4385,126 @@ msgstr ""
 "Če je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Ločilo podpisa"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Vrini samodejno"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Samodejni zaženi zunanji urejevalnik"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Razveljavi nivo"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Prelom sporočila ob"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znakov"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Prelom citata"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Prelomi ob vnosu"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Prelomi pred pošiljanjem"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Samodejno izberi račun za odgovore"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citiraj sporočila ob odgovarjanju"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Oblika odgovora"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Znak za citiranje"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Oblika posredovanja"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Pisava"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavja (kot `From:', `Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrajšaj novičarske skupine daljše od"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "Izbriši"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Omogoči barvanje sporočila"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4586,64 +4512,64 @@ msgstr ""
 "Prikaži večzložno abecedo in števila kot\n"
 "znake ASCII (samo japonščina)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavje nad ogledom sporočila"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "točk(e)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Začasno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Poteče po"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4651,36 +4577,36 @@ msgstr ""
 "(Nastavitev na '0' bo shranila prepustno frazo\n"
 " za celotno sejo)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vnašanjem gesla"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporočilom ni izbrana."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4688,216 +4614,216 @@ msgstr ""
 "(Sporočila bodo označena do izvršitve,\n"
 "če je to izklopljeno)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Prikaži pogovorno okno za sprejem"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Vprašaj pred izpranjenjem"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Opozori, če so čakajoča sporočila"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot desetiško število s 24-urnim prikazom"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot desteiško število z 12-urnim prikazom"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4921,11 +4847,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4939,7 +4865,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4951,15 +4877,15 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Izbira pisave"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4969,31 +4895,31 @@ msgstr ""
 "Lahko tudi spremenite bližnjice do vsakega menija, čepritisnete katerokoli "
 "tipko, ko na kos kaže miškin kazalec"
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Nastavitev prikrojenega zaglavja"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Prikrojeno zaglavje"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Ime zaglavja ni nastavljeno."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Izbriši zaglavje"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Ali resnično želite izbrisati to zaglavje?"
 
@@ -5001,150 +4927,150 @@ msgstr "Ali resnično želite izbrisati to zaglavje?"
 msgid "Creating display header setting window...\n"
 msgstr "Ustvarjam okno za nastavitev prikaza zaglavja...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Ime zaglavja"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Prikaži zaglavja"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skrita zaglavja"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Prikaži vsa nenastavljena zaglavja"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Berem nastavitve za prikaz zaglavij...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Pišem nastavitve za prikaz zaglavij...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "To zaglavje je že na seznamu."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Nastavitev filtra"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Za:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/Prepiš_i..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Izbriši pravilo"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Ali res želite izbrisati to pravilo?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Izbriši pravilo"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Skrita zaglavja"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Sporočila"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "vsebuje"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne vsebuje"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5201,27 +5127,27 @@ msgstr "Izvedi"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Mapa"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Naslov"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavje"
@@ -5393,7 +5319,7 @@ msgstr "Izbriši predlogo"
 msgid "Do you really want to delete this template?"
 msgstr "Ali res želite izbrisati to predlogo?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
@@ -5416,11 +5342,11 @@ msgstr "Pošiljanje čakajočega sporočila %d ni uspelo.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Ustvarjam pogovorno okno napredka...\n"
 
@@ -5432,97 +5358,66 @@ msgstr "med popravljanjem podatkov je prišlo do napake.\n"
 msgid "Can't write to file.\n"
 msgstr "Ne morem pisati v datoteko.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Hopla: Podpis ni overovljen"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Noben podpis ni bil najden"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Dober podpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "SLAB podpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Ni javnega ključa za overovitev podpisa"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Napaka ob overovljanju podpisa"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Različna rezultata za podpisa"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Napaka: neznan status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Dober podpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "SLAB podpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Ne morem najti uporabnikovega ID za ta ključ."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                 kot\"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Podpis narejen v %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "PRstni odtis ključa: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Napaka ob overovljanju podpisa"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Prosim, izberite ključ za `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Zbiram informacije za `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Izberite ključ"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID ključa"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Vrednost"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Vnesite novega uporabnika ali identifikator ključa:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavje čakajočega sporočila je razbito.\n"
@@ -5609,15 +5504,78 @@ msgstr ""
 "če ga imate.\n"
 "Če niste prepričani, samo izberite V redu."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Preverjam podpis"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Noben podpis ni bil najden"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Dober podpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Dober podpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Podpis narejen v %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "SLAB podpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "SLAB podpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Ni javnega ključa za overovitev podpisa"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH ni na razpolago\n"
@@ -5822,259 +5780,259 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Delam ogled povzetka...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Oznaka procesa"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 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:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 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:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 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:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 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:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 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:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 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:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 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:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, 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:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Izbiram vsa sporočila..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Raznitujem za izvršitev..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "Datoteka %s že obstaja\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Ustvarjam ogled besedila...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Za shranitev tega dela, odprite kontekstni meni z "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "desnim klikom in izberite `Shrani kot...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6082,11 +6040,11 @@ msgstr ""
 "ali pritisnite tipko `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Za prikaz tega dela kot sporočilo izberite"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6094,35 +6052,35 @@ msgstr ""
 "`Prikaži kot besedilo' ali pritisnite tipko `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Za odprtje tega dela z zunanjimprogramom izberite"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Odpri' ali `Odpri z...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ali dvakrat kliknite ali kliknite srednji gumb "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ali pritisnite tipko `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Ta podpis še ni bil preverjen.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Da ga preverite, odprite meni z\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "desnim klikom in izberite `Preveri podpis'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6155,6 +6113,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
 
+#~ msgid "OK"
+#~ msgstr "V redu"
+
+#~ msgid "Close"
+#~ msgstr "Zapri"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Refresh"
+#~ msgstr "Osveži"
+
+#~ msgid "Search"
+#~ msgstr "Iskanje"
+
+#~ msgid "Apply"
+#~ msgstr "Uporabi"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Hopla: Podpis ni overovljen"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Različna rezultata za podpisa"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Napaka: neznan status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                 kot\"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "PRstni odtis ključa: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Najdena oznaka: %s\n"
 
diff --git a/po/sr.po b/po/sr.po
index 914e0560..4dcf6fae 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -64,22 +64,6 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "U redu"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Čitanje konfiguracije za svaki nalog...\n"
@@ -113,11 +97,11 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
 
@@ -129,30 +113,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Izmeni"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Obriši "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dole"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gore"
@@ -161,13 +145,6 @@ msgstr "Gore"
 msgid " Set as default account "
 msgstr "Postavi kao uobičajeni nalog "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Zatvori"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Obriši nalog"
@@ -176,24 +153,15 @@ msgstr "Obriši nalog"
 msgid "Do you really want to delete this account?"
 msgstr "Želite li zaista obrisati ovaj nalog?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Ne"
 
@@ -239,29 +207,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Radi: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Završeno: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Input/output akcija"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Pošalji"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Odustani"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -271,11 +239,11 @@ msgstr ""
 "Unesite naredbu za štampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -285,7 +253,7 @@ msgstr ""
 "Unesite naredbu za štampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -293,13 +261,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Beleške"
 
@@ -307,24 +275,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Odustani"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -345,8 +296,8 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -364,7 +315,7 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
@@ -396,7 +347,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -405,12 +356,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -427,7 +378,7 @@ msgstr "/Nova _grupa"
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -437,7 +388,7 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Izmeni"
@@ -450,18 +401,18 @@ msgstr "/_Obriši"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Ime:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Obriši"
 
@@ -490,18 +441,6 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ne"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -612,7 +551,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Addressbook Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Izgled programa"
 
@@ -656,360 +595,360 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Greška"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Stvaram dijalog za prozor sa upozorenjem...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Prikaži ovu poruku sledeći put"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Narandžasta"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Crvena"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Roze"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Nebesko plava"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Plava"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Smeđa"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Poruka/Snimi u direktorijum _nedovršeno"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Poruka/Pošalji _kasnije i nastavi da pišeš"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Datoeka/_Prikači datoteku"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Unesi datoteku"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/Unesi _potpis"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Izmeni/_Undo"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Izmeni/S_eci"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Izmeni/_Napredno"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Izmeni/_Napredno/Pomeri znak unazad"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Izmeni/_Napredno/Pomeri znak unapred"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Izmeni/_Napredno/Pomeri reč unazad"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Izmeni/_Napredno/Pomeri reč unapred"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Izmeni/_Napredno/Pomeri na početak linije"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Izmeni/_Napredno/Pomeri na kraj linije"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Izmeni/_Napredno/Pomeri na prethodnu liniju"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Izmeni/_Napredno/Pomeri na sledeću liniju"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Izmeni/_Napredno/Obriši prethodni znak"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Izmeni/_Napredno/Obriši sledeći znak"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Izmeni/_Napredno/Obriši prethodnu reč"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Izmeni/_Napredno/Obriši sledeću"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Izmeni/_Napredno/Obriši liniju"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Izmeni/_Napredno/Obriši do kraja linije"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Izmeni/Sažmi trenutni _paragraf"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Pregled"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Pregled/_Za"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Pregled/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Pregled/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Pregled/P_rosledi"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Pregled/Len_jir"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Pregled/_Spajalica"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Izmenjeno]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Pošalji"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1017,27 +956,27 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu pronaći nijedan ključ kome je trenutno dodeljen id ključa `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1047,139 +986,139 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "ne mogu upisati zaglavlje\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME tip"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1190,66 +1129,66 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Prekinuta grupa procesa: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Napiši: unos iz procesa praćenja\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti nezavisni editor\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu snimiti u datoteku\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Čitanje pipe-a nije uspelo\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "u Nedovršeno"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Zameni"
 
@@ -1257,77 +1196,76 @@ msgstr "Zameni"
 msgid "Edit address"
 msgstr "Izmeni adresu"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Dodaj novu osobu"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Izmeni detalje osobe"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Adresa e-pošte mora biti navedena."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Ime i iznos moraju biti navedeni."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Izmeni lične podatke"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Pomeri gore"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Pomeri dole"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Izmeni"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Iznos"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Osnovno"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Atributi korisnika"
 
@@ -1343,7 +1281,7 @@ msgstr "Datoteka nije u formatu adresara."
 msgid "Could not read file."
 msgstr "Ne mogu pročitati datoteku."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Izmeni adresar"
 
@@ -1356,7 +1294,7 @@ msgstr " Proveri datoteku "
 msgid "File"
 msgstr "Datoteka"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Dodaj Novi adresar"
 
@@ -1388,32 +1326,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomerite adrese e-pošte u ili iz grupe sa strelicama"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Izmeni detalje grupe"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Izmeni direktorijum"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -1425,11 +1363,11 @@ msgstr "Datoteka nije u JPilot formatu."
 msgid "Select JPilot File"
 msgstr "Odaberite JPilot datoteku"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1438,7 +1376,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Dodatne pojedinosti adrese e-pošte"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Dodajte novi JPilot unos"
 
@@ -1446,63 +1384,63 @@ msgstr "Dodajte novi JPilot unos"
 msgid "Connected successfully to server"
 msgstr "Uspešno spojen na server"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Ne mogu se povezati na server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Uredi LDAP server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Proveri server"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Baza pretrage"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Kriterijum pretrage"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Ponovo "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind Lozinka"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Timeout (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Max. Unos"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Prošireno"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Novi LDAP server"
 
@@ -1514,7 +1452,7 @@ msgstr "Izmeni LDAP - Izbor baze pretrage"
 msgid "Available Search Base(s)"
 msgstr "Dostupne baze pretrage"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Ne mogu pročitati Baze Pretrage sa servera - postavite ručno"
 
@@ -1526,11 +1464,11 @@ msgstr "Datoteka nije vCard formata."
 msgid "Select vCard File"
 msgstr "Odaberite vCard datoteku"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Izmeni vCard unose"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Dodaj novi vCard unos"
 
@@ -1559,10 +1497,10 @@ msgstr " Odaberite... "
 msgid "Select exporting file"
 msgstr "Odaberite datoteku za izvoz"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
 
@@ -1570,41 +1508,41 @@ msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -1667,65 +1605,65 @@ msgstr "Nepročitano"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Osvežavam sva stabla direktorijuma..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1735,16 +1673,16 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1753,24 +1691,24 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1779,34 +1717,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -1838,10 +1776,6 @@ msgstr "Poruke"
 msgid "Type"
 msgstr "Tip"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Osveži"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "moderisano"
@@ -1854,15 +1788,15 @@ msgstr "samo čitanje"
 msgid "unknown"
 msgstr "nepoznato"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Gotovo."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
@@ -1879,11 +1813,11 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -2121,7 +2055,7 @@ msgstr "Ime Atributa"
 msgid "Attribute"
 msgstr "Atribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Odaberi"
 
@@ -2145,7 +2079,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Sled."
 
@@ -2161,189 +2095,189 @@ msgstr "Atributi"
 msgid "Finish"
 msgstr "Gotovo"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, 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:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Protokol greška."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -2361,7 +2295,7 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2370,11 +2304,11 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ne podržava g_thread.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2382,16 +2316,16 @@ msgstr ""
 "GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2401,64 +2335,64 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3109,58 +3043,58 @@ msgstr "/_Pomoć/_FAQ/_Italijanski"
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3170,16 +3104,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3188,144 +3122,144 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Prima novu poštu"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu poštu sa svih naloga"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Šalje odložene poruku/e"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napiši"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Napiši novu poruku"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Prosleđuje poruku"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Obriši poruku"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Sledeća nepročitana poruka"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Podešavanja naloga"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3427,10 +3361,6 @@ msgstr "Osjetljiv na velika/mala slova"
 msgid "Backward search"
 msgstr "Pretraga unazad"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Pretraga"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Polje pretrage"
@@ -3455,28 +3385,28 @@ msgstr "Pretraga završena"
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Sačuvaj kao"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Prepisati postojeću datoteku?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3485,7 +3415,7 @@ msgstr ""
 "Unesite naredbu za štampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3545,7 +3475,7 @@ msgstr "Pravim MIME pregled...\n"
 msgid "MIME Type"
 msgstr "MIME tip"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Tekst"
 
@@ -3557,15 +3487,15 @@ msgstr "Dodatak"
 msgid "Select \"Check signature\" to check"
 msgstr "Odaberite \"Proveri potpis\" da proverite"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Ne mogu sačuvati deo višedelne poruke"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Otvori sa"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3574,7 +3504,7 @@ msgstr ""
 "Unesite naredbu za otvaranje datoteke:\n"
 "(`%s' je sinonim za ime datoteke)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Naredba MIME nije ispravna: `%s'"
@@ -3680,15 +3610,15 @@ 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."
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[nema ID korinika]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3701,7 +3631,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3709,72 +3639,68 @@ msgstr ""
 "Pogrešna lozinka! Pokušajte ponovo...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Potrebni APOP timestamp nije pronađen u pozdravu\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntax greška u timestampu kod pozdrava\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "greška POP3 protokola \n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "pogrešna xover linija: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Brianje pouka koje su istekle %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Preskakanje poruke %d (%d byte-ova)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "sanduče je zaključano\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "ne mogu pokrenuti TLS sesiju\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "Naredba"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "greška prilikom provere identiteta\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Pronađeno %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Primeni"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram prozor za svojstva naloga...\n"
@@ -3796,11 +3722,11 @@ msgstr "Podešavanje naloga"
 msgid "Creating account preferences window...\n"
 msgstr "Stvaranje prozora za podešavanje naloga...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -3910,7 +3836,7 @@ msgstr "Preuzmi sve poruke sa servera"
 msgid "Receive size limit"
 msgstr "Ograničenje u veličini za primanje"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3930,7 +3856,7 @@ msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 msgid "Authentication method"
 msgstr "Način provere identieta"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -3938,7 +3864,7 @@ msgstr "Automatski"
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Primi sve' proverava poruke za ovaj nalog"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Zaglavlje"
 
@@ -3954,7 +3880,7 @@ msgstr "Generiši ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4150,20 +4076,20 @@ msgstr ""
 "načina za šifrovanje poruka. On nije saglasan sa\n"
 "RFC 3156 - MIME Sigurnost sa OpenPGP-om."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Ime menija:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Linija za naredbe:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4199,44 +4125,44 @@ msgstr ""
 "   %F za listu imena datoteka odabranih poruka\n"
 "   %p za deo odabrane poruke."
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "Zameni"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr "Sintaksna pomoć"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrovane akcije"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Novo)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Ime menija nije podešeno."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Dve tačke ':' nisu dozvoljene u imenu menija."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Ime menija je previše dugačko."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Linija za neredbe nije podešena."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Ime menija i naredba su previše dugački."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4247,91 +4173,91 @@ msgstr ""
 "%s\n"
 "ima sintaksnu grešku."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Obriši akciju"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Želite li zaista obrisati ovu akciju?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Stvaranje prozor za uobičajena podešavanja...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Uobičajena podešavanja"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Prikaz"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Poruka"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Spoljni program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Koristi spoljni program za prihvatanje"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Naredba"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokalni spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Prihvati sa spoola"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtriraj pri prihvataju"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Auto-provera nove pošte"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "svakih"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuta"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Proveri poštu prilikom starta"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Osveži sve direktorijume posle prihvatanja"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "News"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4339,115 +4265,115 @@ msgstr ""
 "Maksimalni broj članaka za preuzimanje\n"
 "(0 je za neograničeno)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Sačuvaj poslate poruke u poslato"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Izlazni charset"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Evropski (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Evropski (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4455,189 +4381,189 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišćen."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Odvaja potpis"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni spoljašnji editor"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Undo nivo"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Sažmi poruke na"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Sažmi citat"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Sažmi pri unosu"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Sažmi pre slanja"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi nalog za odgovore"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Taster za odgovor povlači odgovor za listu"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Format proseđivanja"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Objašnjenje simbola "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao što su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe duže od"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "slova"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Ističe posle"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4645,36 +4571,36 @@ msgstr ""
 "(Postavljanje na '0' će smestiti loyinku\n"
 "u toku cele sesije)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sanduče posle primanja pošte"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4682,217 +4608,217 @@ msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se završi"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredište kada se dva put klikne"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Pitaj pre pražnjenja"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vreme"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vreme"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4916,11 +4842,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4934,7 +4860,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4946,15 +4872,15 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Izbor fonta"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4964,31 +4890,31 @@ msgstr ""
 "Takođe možete menjati prečice svakog menija pritiskom na\n"
 "bilo koji taster kada postavite kursor miša na pojedinu stvar."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Podešavanje određenog zaglavlja"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Određeno zaglavlje"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Ime zaglavlja nije podešeno."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Obriši zaglavlje"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Zaista želite obrisati ovo zaglavlje?"
 
@@ -4996,150 +4922,150 @@ msgstr "Zaista želite obrisati ovo zaglavlje?"
 msgid "Creating display header setting window...\n"
 msgstr "Stvaranje prozora za podešavanje zaglavlja...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Prikaz podešavanje zaglavlja"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Ime zaglavlja"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Prikazano zaglavlje"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Skriveno zaglavlje"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Prikaži sva nenavedena zaglavlja"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Čitanje konfiguraciju za prikaz zaglavlja...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Pisanje konfiguraciju za prikaz zaglavlja...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Ovo zaglavlje je već na listi."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Podešavanje filtera"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "Za:"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/_Kopiranje..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Zaista obrisati pravilo?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obriši pravilo"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "Poruka"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "sadrži"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadrži"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5196,27 +5122,27 @@ msgstr "Izvrši"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "Direktorijum"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
@@ -5388,7 +5314,7 @@ msgstr "Briši šablon"
 msgid "Do you really want to delete this template?"
 msgstr "Zaista želite obrisati ovaj šablon?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
@@ -5411,11 +5337,11 @@ msgstr "Slanje odložene poruke %d nije uspelo.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Stvaranje dijaloga napretka...\n"
 
@@ -5427,97 +5353,66 @@ msgstr "došlo je do greške prilikom dohvatanja podataka.\n"
 msgid "Can't write to file.\n"
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Ups: Potpis nije potvrđen"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Nema potpisa"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Dobar potpis"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "LOŠ potpis"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Nema javnog ključa za potvrdu potpisa"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Greška pri potvrđivanju potpisa"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Različiti rezultati za potpise"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Greška: Nepoznat status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Dobar potpis od \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "LOŠ potpis od \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Ne mogu naći ID korisnika za ovaj ključ."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Potpis napravljen %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Otisak ključa: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Greška pri potvrđivanju potpisa"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Molim, odaberite ključ za `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Primam info za `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Odaberite ključeve"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "ID ključa"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Oznaka"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Dodaj ključ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Upišite drugog korisnika ili ID ključa:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Zaglavlje odložene poruke je loše.\n"
@@ -5607,15 +5502,78 @@ msgstr ""
 "ako imate jedan.\n"
 "Ako niste sigurni, odaberite U redu."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Provera potpisa"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s od \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Nema potpisa"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Dobar potpis od \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Dobar potpis"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Potpis napravljen %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "LOŠ potpis od \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "LOŠ potpis"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Nema javnog ključa za potvrdu potpisa"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH nije dostupan\n"
@@ -5820,258 +5778,258 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda održavanja...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 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:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 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:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Odabiranje svih poruka..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Rasipanje za izvršenje..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Stvaranje pregleda teksta...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Za snimanje ovog dela, otovrite meni konteksta sa "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "desnim klikom i odaberite `Sačuvaj kao...', "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6079,11 +6037,11 @@ msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Za prikaz ovog dela kao tekst, odaberite "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6091,35 +6049,35 @@ msgstr ""
 "`Prikaži kao tekst' ili pritisnite `t' tipku.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Za prikaz ovog dela sa spoljnim programom, odaberite "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Otvori' ili `Otvoranje sa...', "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ili dva puta kliknite, ili kliknite srednju tipku, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "ili pritisnite tipku `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Ovaj potpis još nije proveren.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Za prvoeru, otvorite kontekst meni sa\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "desnom tipkom i odaberite `Proveri potpis'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6152,6 +6110,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
 
+#~ msgid "OK"
+#~ msgstr "U redu"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Refresh"
+#~ msgstr "Osveži"
+
+#~ msgid "Search"
+#~ msgstr "Pretraga"
+
+#~ msgid "Apply"
+#~ msgstr "Primeni"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Ups: Potpis nije potvrđen"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Različiti rezultati za potpise"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Greška: Nepoznat status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Otisak ključa: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Pronađena oznaka: %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 1ce9f633..451579dd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -65,22 +65,6 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "OK"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Läser all konfiguration för varje konto...\n"
@@ -115,11 +99,11 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Namn"
 
@@ -131,30 +115,30 @@ msgstr "Protokoll"
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Ta bort "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ner"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Upp"
@@ -163,13 +147,6 @@ msgstr "Upp"
 msgid " Set as default account "
 msgstr " Använd som förvalt konto "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Stäng"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Ta bort konto"
@@ -178,24 +155,15 @@ msgstr "Ta bort konto"
 msgid "Do you really want to delete this account?"
 msgstr "Vill du verkligen ta bort detta konto?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Nej"
 
@@ -241,29 +209,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Kör: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Avslutad: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Åtgärdens in-/utdata"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Skicka "
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -274,11 +242,11 @@ msgstr ""
 "(\"%%h\" kommer att ersättas med argumentet)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Åtgärdens dolda användarargument"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -289,7 +257,7 @@ msgstr ""
 "(\"%%u\" kommer att ersättas med argumentet)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Åtgärdens användarargument"
 
@@ -297,13 +265,13 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -311,24 +279,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -349,8 +300,8 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -368,7 +319,7 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
@@ -400,7 +351,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -409,12 +360,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -431,7 +382,7 @@ msgstr "/Ny _grupp"
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -441,7 +392,7 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/_Redigera"
@@ -454,18 +405,18 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Namn:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -494,18 +445,6 @@ msgstr "Ta bort adress(er)"
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Nej"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -618,7 +557,7 @@ msgstr "Fel vid konvertering av adressbok"
 msgid "Addressbook Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Gränssnitt"
 
@@ -662,351 +601,351 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Fel"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Skapar dialog för meddelandepanel...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Visa detta meddelande nästa gång"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Röd"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Himmelsblå"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Blå"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Grön"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Brun"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/_Redigera/A_vancerat"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Redigera/A_vancerat/Gå ett tecken bakåt"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Redigera/A_vancerat/Gå ett tecken framåt"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Redigera/A_vancerat/Gå ett ord bakåt"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Redigera/A_vancerat/Gå ett ord framåt"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Redigera/A_vancerat/Gå till början av raden"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Redigera/A_vancerat/Gå till slutet av raden"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Redigera/A_vancerat/Gå till föregående rad"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Redigera/A_vancerat/Gå till nästa rad"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Redigera/A_vancerat/Radera ett tecken bakåt"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Redigera/A_vancerat/Radera ett tecken framåt"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Redigera/A_vancerat/Radera ett ord bakåt"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Redigera/A_vancerat/Radera ett ord framåt"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Redigera/A_vancerat/Radera rad"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Redigera/A_vancerat/Radera till slutet av raden"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Skriv meddelande%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1014,27 +953,27 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Kunde inte hitta någon nyckel associerad med nu aktiva nyckel-ID \"%s\"."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1045,138 +984,138 @@ msgstr ""
 "%s till %s.\n"
 "Skicka ändå?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "kan inte skriva brevhuvud\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME-typ"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1187,66 +1126,66 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Avslutade processgrupps-id: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Temporär fil: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Skriv: indata från bevakad process\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Kunde inte köra extern redigerare\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Kunde inte skriva till fil\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Kunde inte läsa från rör\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Kasta meddelande"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Detta meddelande har ändrats. Kasta det?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Kasta"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "till Utkast"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Ersätt"
 
@@ -1254,77 +1193,76 @@ msgstr "Ersätt"
 msgid "Edit address"
 msgstr "Redigera adress"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Lägg till ny person"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Redigera persondetaljer"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "En e-postadress måste anges."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Namn och Värde måste anges."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Redigera persondata"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Visat namn"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Smeknamn"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Alias"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Flytta upp"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Flytta ner"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Ändra"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Töm"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Värde"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Grundläggande data"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Användarattribut"
 
@@ -1340,7 +1278,7 @@ msgstr "Filen verkar inte vara i ett giltigt adressboksformat."
 msgid "Could not read file."
 msgstr "Kunde inte läsa fil."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
@@ -1353,7 +1291,7 @@ msgstr " Kontrollera fil "
 msgid "File"
 msgstr "Fil"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Lägg till ny adressbok"
 
@@ -1385,32 +1323,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flytta e-postadresser till eller från grupp med pilknapparna"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -1422,11 +1360,11 @@ msgstr "Filen verkar inte vara i JPilot-format."
 msgid "Select JPilot File"
 msgstr "Välj JPilot-fil"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1435,7 +1373,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Ytterligare e-postadressobjekt"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Lägg till ny JPilot-post"
 
@@ -1443,63 +1381,63 @@ msgstr "Lägg till ny JPilot-post"
 msgid "Connected successfully to server"
 msgstr "Anslöt framgångsrikt till server"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Kunde inte ansluta till server"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Redigera LDAP-server"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Kontrollera server "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Sökbas"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Sökkriterier"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Återställ "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Bind-DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Bind-lösenord"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Väntetid (sek)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Utökad"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Lägg till ny LDAP-server"
 
@@ -1511,7 +1449,7 @@ msgstr "Redigera LDAP - Välj sökbas"
 msgid "Available Search Base(s)"
 msgstr "Tillgänglig(a) sökbas(er)"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Kunde inte läsa sökbas(er) från server - ställ in dem manuellt"
 
@@ -1523,11 +1461,11 @@ msgstr "Filen verkar inte vara i giltigt vCard-format."
 msgid "Select vCard File"
 msgstr "Välj vCard-fil"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Redigera vCard-post"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Lägg till ny vCard-post"
 
@@ -1556,10 +1494,10 @@ msgstr " Välj... "
 msgid "Select exporting file"
 msgstr "Välj exportfil"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
 
@@ -1567,41 +1505,41 @@ msgstr "misslyckades skriva konfiguration till fil\n"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -1662,64 +1600,64 @@ msgstr "Olästa"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Uppdaterar alla mappträd..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1729,16 +1667,16 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1747,24 +1685,24 @@ msgstr ""
 "Alla mappar och meddelanden under \"%s\" kommer att tas bort.\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Töm alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1773,34 +1711,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -1832,10 +1770,6 @@ msgstr "Meddelanden"
 msgid "Type"
 msgstr "Typ"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Uppdatera"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "modererad"
@@ -1848,15 +1782,15 @@ msgstr "skrivskyddad"
 msgid "unknown"
 msgstr "okänd"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Färdig."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskussionsgrupper mottagna (%s lästa)"
@@ -1873,11 +1807,11 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Inget Från)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -2110,7 +2044,7 @@ msgstr "Attributnamn"
 msgid "Attribute"
 msgstr "Attribut"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Välj"
 
@@ -2134,7 +2068,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Nästa"
 
@@ -2150,133 +2084,133 @@ msgstr "Attribut"
 msgid "Finish"
 msgstr "Avsluta"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Färdig (inga nya meddelanden)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, 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:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2285,27 +2219,27 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2314,11 +2248,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2327,15 +2261,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -2353,7 +2287,7 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2362,11 +2296,11 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread stöds inte av glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2374,16 +2308,16 @@ msgstr ""
 "GnuPG är inte installerad riktigt eller så är versionen för gammal.\n"
 "OpenPGP-stöd avstängt."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2393,23 +2327,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2417,40 +2351,40 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Åtgärdskonfiguration"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3083,56 +3017,56 @@ msgstr "/_Hjälp/_FAQ/_Italiensk"
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter fönsterseparationstyp från %d till %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "Töm alla meddelanden i alla papperskorgar?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3142,16 +3076,16 @@ msgstr ""
 "Om en existerande brevlåda specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3160,141 +3094,141 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Hämta"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Hämta ny post"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Hämta allt"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Hämta ny post från alla konton"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Skicka köade meddelanden"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Svara på meddelandet"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Nästa olästa meddelande"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Kontoinställningar"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Du är frånkopplad. Klicka på ikonen för att ansluta."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Du är ansluten. Klicka på ikonen för att koppla från."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3396,10 +3330,6 @@ msgstr "Skiftlägeskänslig"
 msgid "Backward search"
 msgstr "Sök baklänges"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Sök"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Sökning misslyckades"
@@ -3424,28 +3354,28 @@ msgstr "Sökning klar"
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Spara som"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Skriv över befintlig fil?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3454,7 +3384,7 @@ msgstr ""
 "Skriv in utskriftskommando:\n"
 "(\"%s\" kommer att ersättas med filnamnet)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3514,7 +3444,7 @@ msgstr "Skapar MIME-vy...\n"
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Text"
 
@@ -3526,15 +3456,15 @@ msgstr "Bilagor"
 msgid "Select \"Check signature\" to check"
 msgstr "Välj \"Undersök signatur\" för att undersöka"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Kan inte spara delen av multipart-meddelandet."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Öppna med"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3543,7 +3473,7 @@ msgstr ""
 "Skriv in kommandot för att öppna filen:\n"
 "(\"%s\" kommer att ersättas med filnamnet)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME-visningskommandot är felaktigt:\"%s\""
@@ -3648,15 +3578,15 @@ msgstr "Fel uppstod vid postning\n"
 msgid "Error occurred while sending command\n"
 msgstr "Fel uppstod när kommandot skickades\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[inget användarid]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3669,7 +3599,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3677,70 +3607,66 @@ msgstr ""
 "Fel lösenfras! Försök igen...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nödvändig APOP-tidsmarkering inte funnen i hälsning\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaxfel på tidsmarkering i hälsning\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3-protokollfel\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "felaktigt UIDL-svar: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Tar bort utgånget meddelande %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Hoppar över meddelande %d (%d byte)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "brevlådan är låst\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "sessionens väntetid tog slut\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "kan inte starta TLS-session\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "fel uppstod vid autentisering\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "kommando är inte stött\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Fann %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Verkställ"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Öppnar fönster för kontoinställningar...\n"
@@ -3762,11 +3688,11 @@ msgstr "Kontoinställningar"
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Integritet"
 
@@ -3875,7 +3801,7 @@ msgstr "Hämta alla meddelanden från server"
 msgid "Receive size limit"
 msgstr "Gräns för mottagningsstorlek"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3895,7 +3821,7 @@ msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3903,7 +3829,7 @@ msgstr "Automatisk"
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Hämta allt\" hämtar post på detta konto"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Brevhuvud"
 
@@ -3919,7 +3845,7 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4114,19 +4040,19 @@ msgstr ""
 "ASCII-pansar-läget för krypterade meddelanden.\n"
 "Det följer inte RCF 3156 - MIME Security with OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Åtgärdskonfiguration"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menynamn:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Kommandorad:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4166,43 +4092,43 @@ msgstr ""
 "   %h för ett dolt argument tillhandahållet av användaren\n"
 "   %s för markerad text"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr "Ersätt"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Syntaxhjälp "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Registrerade åtgärder"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Ny)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menynamn är inte angivet."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Kolon, \":\" är inte tillåtet i menynamnet."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menynamnet är för långt."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Kommandorad saknas."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menynamn och kommando är för långa"
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4213,91 +4139,91 @@ msgstr ""
 "%s\n"
 "har ett syntaktiskt fel."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Ta bort åtgärd"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Vill du verkligen ta bort denna åtgärd?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Skapar fönster för allmänna inställningar...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Allmänna inställningar"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Citat"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Visa"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Övrigt"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Externt program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Använd externt program för hämtning"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Kommando"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Lokal spole (spool)"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Inkorporera från spole"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Filtrera vid inkorporering"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Sökväg till spole"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Hämta ny post automatiskt"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "med"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "minuters mellanrum"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Hämta ny post vid uppstart"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4305,115 +4231,115 @@ msgstr ""
 "Maximalt antal inlägg att hämta\n"
 "(obegränsat om 0 angivits)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Spara skickade meddelanden i kö-mappen"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Utgående kodning"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitars ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4421,11 +4347,11 @@ msgstr ""
 "Om \"Automatisk\" är vald, kommer den optimala\n"
 "kodningen för det nuvarande språket att användas."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Kodning för överföring"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4433,115 +4359,115 @@ msgstr ""
 "Ange vilken kodning för överföring meddelandetexten\n"
 "ska ha när det innehåller icke-ASCII-tecken."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Infoga automatiskt"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Ångranivå"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Radbryt meddelanden vid"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Radbryt citering"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Radbryt vid indata"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Radbryt innan brevet skickas"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Välj automatiskt konto för svar"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Citera meddelande vid svar"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Svara-knappen ger svar till e-postlista"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Svarsformat"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Citationstecken"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Vidarebefordringsformat"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Beskrivning av symboler "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Översätt brevhuvudsnamn (t.ex. \"Från:\", \"Ärende:\")"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Visa antal olästa bredvid mappnamn"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Förkorta diskussionsgrupper längre än"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "bokstäver"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Ställ in fält att visa i summeringen... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Aktivera färgläggning av meddelande"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4549,63 +4475,63 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanför meddelandevy"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Undersök signaturer automatiskt"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturundersökning i ett extrafönster"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra lösenfras temporärt i minnet"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Utgår efter"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4613,35 +4539,35 @@ msgstr ""
 "(Lösenfrasen kommer att lagras hela sessionen\n"
 "om 0 angivits)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Håll fokus under inskrivning av lösenfas"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Öppna alltid meddelanden i summering, när de valts"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Öppna första olästa meddelande vid öppning av mapp"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Gå till inkorgen efter att ny post kommit"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4649,216 +4575,216 @@ msgstr ""
 "(Meddelanden kommer endast vara markerade tills du väljer\n"
 " \"Utför köade meddelanden\" om detta är avstängt)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid hämtningsfel"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog efteråt"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr "Ställ in tangentbindningar..."
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Fråga innan tömning"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Väntetid för uttags-I/O (socket I/O):"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4882,11 +4808,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4900,7 +4826,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4912,15 +4838,15 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Typsnittsval"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4931,31 +4857,31 @@ msgstr ""
 "att trycka valfri tangent eller tangentkombination\n"
 "när muspekaren är över genvägen."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Egendefinierat brevhuvud"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Egna brevhuvuden"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Brevhuvudsnamn är inte angivet."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Ta bort brevhuvud"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Vill du verkligen ta bort detta brevhuvud?"
 
@@ -4963,143 +4889,143 @@ msgstr "Vill du verkligen ta bort detta brevhuvud?"
 msgid "Creating display header setting window...\n"
 msgstr "Skapar fönster för brevhuvudinställning...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Brevhuvudsinställning"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Brevhuvudsnamn"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Visade brevhuvuden"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Dolda brevhuvuden"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Visa alla ospecificerade brevhuvuden"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Läser konfiguration för visning av brevhuvuden...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Skriver konfiguration för visning av brevhuvuden...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Detta brevhuvud finns redan i listan."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filterinställningar"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Överst"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Underst"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Vill du verkligen ta bort denna regel?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Om något av följande villkor matchar"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Om alla av följande villkor matchar"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Utför följande åtgärder:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "Till eller Kopia"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Något brevhuvud"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Redigera brevhuvud..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Meddelandetext"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Resultat av kommando"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "innehåller"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "innehåller inte"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "är"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "är inte"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "matchar regex"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "matchar inte regex"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "är större än"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "är mindre än"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "är längre än"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "är kortare än"
 
@@ -5147,23 +5073,23 @@ msgstr "Kör kommando"
 msgid "Stop rule evaluation"
 msgstr "Stoppa regelutvärdering"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "mapp"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "adress"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Redigera brevhuvudlista"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Brevhuvuden"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Brevhuvud:"
 
@@ -5329,7 +5255,7 @@ msgstr "Ta bort mall"
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
@@ -5352,11 +5278,11 @@ msgstr "Misslyckades med att skicka köat meddelande %d.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Status"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Skapar förloppsdialog...\n"
 
@@ -5368,97 +5294,66 @@ msgstr "fel uppstod vid inhämtning av data.\n"
 msgid "Can't write to file.\n"
 msgstr "Kan inte skriva till fil.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Hoppsan: Signatur ej verifierad"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Ingen signatur funnen"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Bra signatur"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "FELAKTIG signatur"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Ingen publik nyckel att verifiera signaturen med"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Fel vid verifikation av signatur"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Olika resultat för signaturer"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Fel: Okänt status"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Bra signatur från \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "FELAKTIG signatur från \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Kan inte finna användar-ID för denna nyckel."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                alias \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Signatur skapad %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Nyckelfingeravtryck: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Fel vid verifikation av signatur"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Välj nyckel för \"%s\""
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Samlar info för \"%s\" ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Välj nycklar"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Nyckel-ID"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Värde"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Lägg till nyckel"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Skriv in en annan användar- eller nyckel-ID"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Brevhuvud i köat meddelande är trasigt.\n"
@@ -5546,15 +5441,78 @@ msgstr ""
 "om du har en.\n"
 "Är du inte säker, välj bara OK."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Undersöker signatur"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s från \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Ingen signatur funnen"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Bra signatur från \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Bra signatur"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Signatur skapad %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "FELAKTIG signatur från \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "FELAKTIG signatur"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Ingen publik nyckel att verifiera signaturen med"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH ej tillgängligt\n"
@@ -5757,255 +5715,255 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Skapar summeringsvy...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Behandla markering"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Sök igen"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, 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:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, 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:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Markerar alla meddelanden..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Avtrådar för att utföra köade åtgärder..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "filen %s finns redan\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Skapar textvy...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "För att spara denna del, ta fram snabbmenyn genom att "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "högerklicka och välja \"Spara som...\",  "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6013,11 +5971,11 @@ msgstr ""
 "eller tryck på \"y\"-tangenten.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "För att visa denna del som textmeddelande, välj "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6025,35 +5983,35 @@ msgstr ""
 "\"Visa som text\" eller tryck på \"t\"-tangenten.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "För att öppna denna del med ett externt program, välj "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "\"Öppna\" eller \"Öppna med...\", "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "eller dubbelklicka, eller klicka med mittenknappen, "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "eller tryck på \"l\"-tangenten"
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Denna signatur har ännu inte undersökts.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "För att undersöka den, öppna snabbmenyn genom att\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "högerklicka och välja \"Undersök signatur\".\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6089,6 +6047,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
 
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Close"
+#~ msgstr "Stäng"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "No"
+#~ msgstr "Nej"
+
+#~ msgid "Refresh"
+#~ msgstr "Uppdatera"
+
+#~ msgid "Search"
+#~ msgstr "Sök"
+
+#~ msgid "Apply"
+#~ msgstr "Verkställ"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Hoppsan: Signatur ej verifierad"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Olika resultat för signaturer"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Fel: Okänt status"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                alias \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Nyckelfingeravtryck: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Fann titel: %s\n"
 
diff --git a/po/tr.po b/po/tr.po
index 3ae1ec2f..f9349651 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15: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"
@@ -66,22 +66,6 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Tamam"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
@@ -116,11 +100,11 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "İsim"
 
@@ -132,30 +116,30 @@ msgstr "Protokol"
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Ekle"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Düzenle"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " Sil "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Yukarı"
@@ -164,13 +148,6 @@ msgstr "Yukarı"
 msgid " Set as default account "
 msgstr " Öntanımlı hesap olarak düzenle "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Kapat"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Hesabı sil"
@@ -179,24 +156,15 @@ msgstr "Hesabı sil"
 msgid "Do you really want to delete this account?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Evet"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Hayır"
 
@@ -242,29 +210,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Çalışıyor: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Tamamlandı: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Eylemin girdi/çıktısı"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr " Gönder"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "İptal"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -275,11 +243,11 @@ msgstr ""
 "(`%%h' argüman ile değiştirilecektir)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Eylemin gizli kullanıcı argümanı"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -290,7 +258,7 @@ msgstr ""
 "(`%%u' argüman ile değiştirilecektir)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Eylemin kullanıcı argümanı"
 
@@ -298,13 +266,13 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -312,24 +280,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "İptal"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/_Dosya"
@@ -350,8 +301,8 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -369,7 +320,7 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
@@ -401,7 +352,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -410,12 +361,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -432,7 +383,7 @@ msgstr "/Yeni _Grup"
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -442,7 +393,7 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Dü_zenle"
@@ -455,18 +406,18 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "İsim:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Sil"
 
@@ -495,18 +446,6 @@ msgstr "Adres(ler)i sil"
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Hayır"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -622,7 +561,7 @@ msgstr "Adres Defteri Çevrim Hatası"
 msgid "Addressbook Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Arayüz"
 
@@ -666,351 +605,351 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Hata"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Uyarı panel penceresi oluşturuluyor...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Bu iletiyi sonraki açılışta tekrar göster"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Turuncu"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Kırmızı"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Pembe"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Gök mavisi"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Yeşil"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Kahverengi"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizinine kaydet"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/Dü_zenle/G_elişmiş"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakteir geri taşı"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakteri ileri taşı"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelimeyi geri taşı"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelimeyi ileri taşı"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Dü_zenle/G_elişmiş/Satırın başına taşı"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Dü_zenle/G_elişmiş/Satırın sonuna taşı"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Dü_zenle/G_elişmiş/Önceki satıra taşı"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Dü_zenle/G_elişmiş/Sonraki satıra taşı"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakter gerisini sil"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir karakter ilerisini sil"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelime sonrasını sil"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Dü_zenle/G_elişmiş/Bir kelime öncesini sil"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Dü_zenle/G_elişmiş/Satırı sil"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Dü_zenle/G_elişmiş/Satır sonunu sil"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Şuanki paragrafı kaydır"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/_Görünüm/_Kodlama/"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Düzenlendi]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "İleti düzenle (%s)"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Gönder"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1018,26 +957,26 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Seçilen `%s' anahtar kimliğiyle bir eşleştirme yapılamadı."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1048,138 +987,138 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "başlıklar yazılamadı\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME türü"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "İçer"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Dosya ekle"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "İmza"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "İmza ekle"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, 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:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1190,66 +1129,66 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Grup numarası %d olan süreç sonlandırıldı"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Geçici dosya: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Düzenle: süreç görüntüsünü içer\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Harici düzenleyici çalıştırılamadı\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Dosyaya yazılamadı\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Boru okumada hata\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "İletiyi sil"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Sil"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "Taslağa Gönder"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Değiştir"
 
@@ -1257,77 +1196,76 @@ msgstr "Değiştir"
 msgid "Edit address"
 msgstr "Adresi Düzenle"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Yeni Kişi Ekle"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Kişi Ayrıntılarını Düzenle"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Bir e-posta adresi girilmelidir."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Bir isim ve değer girilmelidir."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Kişi Verilerini Düzenle"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Görüntülenecek İsim"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Soyadı"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Adı"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Lakabı"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-posta Adresi"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Takma isim"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Yukarı"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Aşağı"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Düzenle"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Değer"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Temel Veriler"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Kullanıcı Öznitelikleri"
 
@@ -1343,7 +1281,7 @@ msgstr "Bu dosya geçerli bir adres defteri biçimi içermiyor."
 msgid "Could not read file."
 msgstr "Dosya okunamadı."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Adres Defterini Düzenle"
 
@@ -1356,7 +1294,7 @@ msgstr " Dosyayı Denetle "
 msgid "File"
 msgstr "Dosya"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Yeni Adres Defteri Ekle"
 
@@ -1388,33 +1326,33 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Kullanılabilir Adresler"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-posta adresini yön tuşlarını kullanarak gruba yerleştirin veya kaldırın"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Grup Ayrıntılarını Düzenle"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Yeni Grup Ekle"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -1426,11 +1364,11 @@ msgstr "Bu dosya JPilot biçiminde değil."
 msgid "Select JPilot File"
 msgstr "JPilot Dosyasını Seç"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1439,7 +1377,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Ek e-posta adres(ler)i"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Yeni JPilot Girdisi Ekle"
 
@@ -1447,63 +1385,63 @@ msgstr "Yeni JPilot Girdisi Ekle"
 msgid "Connected successfully to server"
 msgstr "Sunucuya başarıyla bağlantı kuruldu"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Sunucuya bağlantı kurulamadı"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "LDAP Sunucusunu Düzenle"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Makine Adı"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Port"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Sunucuyu Kontrol Et "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "Tabanı Ara"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Arama Kriteri"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Sıfırla "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "DN'e Bağlan"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Parola Belirt"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Zaman aşımı (sn) "
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Temel"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Gelişmiş"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Yeni LDAP Sunucusu Ekle"
 
@@ -1515,7 +1453,7 @@ msgstr "LDAP Arama Tabanı Düzenle "
 msgid "Available Search Base(s)"
 msgstr "Kullanılabilir Arama Taban(lar)ı"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Sunucudan Arama Taban(lar)ı okunamadı - lütfen elle düzenleyin"
 
@@ -1527,11 +1465,11 @@ msgstr "Bu dosya vCard biçiminde değil."
 msgid "Select vCard File"
 msgstr "vCard Dosyasını Seç"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "vCard Girdisini Düzenle"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Yeni vCard Girdisi Ekle"
 
@@ -1560,10 +1498,10 @@ msgstr " Seç... "
 msgid "Select exporting file"
 msgstr "Aktarılacak dosyayı seçin"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
 
@@ -1571,41 +1509,41 @@ msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -1666,64 +1604,64 @@ msgstr "Okunmamış"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Tüm dizin ağaçları yeniden yaratılıyor..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1733,16 +1671,16 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1751,24 +1689,24 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1777,34 +1715,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -1836,10 +1774,6 @@ msgstr "İletiler"
 msgid "Type"
 msgstr "Tür"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Yenile"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "yöneticili"
@@ -1852,15 +1786,15 @@ msgstr "saltokunur"
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Tamamlandı."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d haber grubu alındı (%s okundu)"
@@ -1877,11 +1811,11 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -2114,7 +2048,7 @@ msgstr "Özellik Adı"
 msgid "Attribute"
 msgstr "Özellik"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Seç"
 
@@ -2138,7 +2072,7 @@ msgstr "LDIF dosyasını Adres Defterine aktar"
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2154,133 +2088,133 @@ msgstr "Özellikler"
 msgid "Finish"
 msgstr "Bitir"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (Yeni ileti yok)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2289,27 +2223,27 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "protokol hatası"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2318,11 +2252,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2331,15 +2265,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -2357,7 +2291,7 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2366,11 +2300,11 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread, glib tarafından desteklenmiyor.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2378,16 +2312,16 @@ msgstr ""
 "GnuPG düzgün kurulmamış veya versiyonu çok eski\n"
 "OpenPGP desteği kapatıldı."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2397,23 +2331,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2421,40 +2355,40 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3088,56 +3022,56 @@ msgstr "/Yardı_m/_SSS/İ_talyanca"
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ayırma tarzı %d den %d e çevriliyor\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3147,16 +3081,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3165,141 +3099,141 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Yeni postaları dağıt"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Tüm hesaplardaki postaları dağıt"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Düzenle"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Yanıtla"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "İletiyi yanıtla"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Herkese yanıtla"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "İletiyi yönlendir"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "İletiyi sil"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Hesap ayarları"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "Çevrimdışısınız. Çevrimiçi olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
@@ -3402,10 +3336,6 @@ msgstr "Durum duyarlılığı"
 msgid "Backward search"
 msgstr "Eskileri arama"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Ara"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Aramada hata oluştu"
@@ -3430,28 +3360,28 @@ msgstr "Arama tamamlandı"
 msgid "Creating message view...\n"
 msgstr "İleti görüntüsü oluşturuluyor...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Farklı kaydet"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Şimdiki dosyanın üzerine yazılsın mı?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3460,7 +3390,7 @@ msgstr ""
 "Yazdırma komutunu giriniz:\n"
 "('%s' dosya adıyla değiştirilecek)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3520,7 +3450,7 @@ msgstr "MIME görüntüsü oluşturuluyor...\n"
 msgid "MIME Type"
 msgstr "MIME Türü"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Metin"
 
@@ -3532,15 +3462,15 @@ msgstr "Ekler"
 msgid "Select \"Check signature\" to check"
 msgstr "Kontol etmek için \"İmzayı Kontrol Et\"i seçn"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "çoklu mesajın parçası saklanmaıyor."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Birlikte aç"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3549,7 +3479,7 @@ msgstr ""
 "Dosyayı açmak için komut satırını açın:\n"
 "(%s dosya ismi ile yer değiştirecek)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
@@ -3654,15 +3584,15 @@ msgstr "Postalama sırasında hata\n"
 msgid "Error occurred while sending command\n"
 msgstr "Komut gönderilirken hata oluştu\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Parola"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[kullanıcı adı yok]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3675,7 +3605,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3683,70 +3613,66 @@ msgstr ""
 "Hatalı parola! Yeniden deneyin...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Gerekli olan APOP zaman etiketi görüşmede bulunamadı\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zaman etiketi yazım hatası\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 protokol hatası\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "hatalı UIDL cevabı: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Eski postalar siliniyor %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Posta atlanıyor %d (%d byte)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "posta kutusu kilitli\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "oturum zaman aşımına uğradı\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "TLS oturumu başlatılamıyor\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "yetkilendirme sırasında hata oluştu\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "komut desteklenmiyor\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata oluştu\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "%s bulundu\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Uygula"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi açılıyor...\n"
@@ -3768,11 +3694,11 @@ msgstr "Hesap tercihleri"
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Gizlilik"
 
@@ -3881,7 +3807,7 @@ msgstr "Sunucudaki tüm iletileri indir"
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "KB"
 
@@ -3901,7 +3827,7 @@ msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -3909,7 +3835,7 @@ msgstr "Otomatik"
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Başlık"
 
@@ -3925,7 +3851,7 @@ msgstr "İleti Numarası Oluştur"
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Düzenle... "
 
@@ -4120,19 +4046,19 @@ msgstr ""
 "OpenPGP ile RFC 3156 - MIME Güvenliği ile uyuşmayan eksi\n"
 "bir yöntemdir."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Eylem ayarları"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Menü adı:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Komut satırı:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4173,43 +4099,43 @@ msgstr ""
 "    %h kullanıcı tarafından belirlenmiş gizli bir argüman için\n"
 "    %s seçili metin için"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr " Değiştir"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " Yazım Yardımı"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Kayıtlı eylemler"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Yeni)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Menü adı belirtilmedi."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "':' kolonu menü adlarında kullanılamaz."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Menü adı çok uzun."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Komut satırı belirtilmedi."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Menü adı ve komut satırı çok uzun."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4220,91 +4146,91 @@ msgstr ""
 "komutunda\n"
 "yazım hatası var."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Eylemi sil"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Bu hesabı silmek istiyor musunuz?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Genel tercihler penceresi oluşturuluyor...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Genel Tercihler"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Alıntı"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Görünüm"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "İleti"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Diğer"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Harici program"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Dağıtım için harici program kullan"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Komut"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Yerel spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Spooldan dağıt"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Dağıtım filtresi"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Makara konumu"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Yeni postaları otomatik denetle"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "her"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "dakikada"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Açılışta yeni e-postaları denetle"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4312,115 +4238,115 @@ msgstr ""
 "Indirilebilecek azami makale sayısı\n"
 "(0 => limitsiz)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Gönderilen iletileri giden kutusuna kaydet"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Giden ileti kod kümesi"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Otomatik (Önerilen)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Batı Avrupa (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Orta Avrupa (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4428,11 +4354,11 @@ msgstr ""
 "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
 "kümesi kullanılacaktır."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Transfer kod kümesi"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4440,115 +4366,115 @@ msgstr ""
 "Mesaj gövdesi ASCII karakter içermediği zaman kullanılacak\n"
 "İçerik Transfer Kodlamasını seçiniz."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "İmza ayıracı"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Otomatik ekle"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Harici düzenleyici otomatik çalıştır"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Geri alma seviyesi"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "İletileri kaydır: "
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Alıntı Kaydırması"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Girdide Kaydır"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Göndermeden önce kaydır"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Yanıtlamalarda hesabı otomatik seç"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Yanıtlarken alıntı yap"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Yanıtla tuşu eposta listelerine de yanıtlasın"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Yanıtlama formatı"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Alıntı işareti"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Yönlendirme biçimi"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Sembollerin açıklaması "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Yazıtipi"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Başlık adlarını çevir('Kimden','Konu' gibi)"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "posta"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Özet Görünüm"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Özetin görüntü nesnesini belirt"
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "İletileri renklendir"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4556,63 +4482,63 @@ msgstr ""
 "Çok bytelı alfabe veya numaraları \n"
 "ASCII karakter olarak göster(Sadece Japonca)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Postaları gösterirken üst kısımda başlıkları göster"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "İmzaları otomatik denetle"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolayı geçici olarak hafızada sakla"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Belirtilen süre sonra geçerliliğini yitir"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4620,35 +4546,35 @@ msgstr ""
 "(Bu değere '0' atayarak parolanın\n"
 "tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Parolayı girerken girdiyi yakala"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "İleti geldiğinde gelen kutusuna git"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4656,216 +4582,216 @@ msgstr ""
 "(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
 "postalar işaretlenecektir.)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Alma penceresini göster"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "İşlemler tamamlandığında alma penceresini kapat"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Çift tıklandığında adresi hedefe ekle"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "Çıkışta"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Çıkışta sor"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "Çıkışta çöpü boşalt"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Boşaltmadan önce sor"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman aşımı:"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4888,11 +4814,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4906,7 +4832,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4918,15 +4844,15 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Yazıtipi seçimi"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4936,31 +4862,31 @@ msgstr ""
 "Ayrıca menüde mousunuzun imleci üzerindeyken herhangi bir tuşa\n"
 "basarak nesnelerin kısayollarını değiştirebilirsiniz."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Özel başlık ayarları"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Özel başlıklar"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Başlık adı belirtilmedi."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Başlığı sil"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Bu başlığı silmek istiyor musunuz?"
 
@@ -4968,143 +4894,143 @@ msgstr "Bu başlığı silmek istiyor musunuz?"
 msgid "Creating display header setting window...\n"
 msgstr "Başlık ayarları görünüm penceresi oluşturuluyor...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Görüntü başlığı ayarları"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Başlık adı"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Görüntülenen Başlıklar"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Gizli başlıklar"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Belirtilmemiş tüm başlıkları göster"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Başlık görüntüleme için yapılandırma dosyası okunuyor...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Başlık görüntüleme için yapılandırma dosyasına yazılıyor...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Bu başlık zaten listede."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Filtre ayarları"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Üst"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Alt"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Kuralı sil"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "B kuralı silmek istiyor musunuz?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Filtre kuralı"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Aşağıdaki herhangi bir kural eşleşirse"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Aşağıdaki tüm koşullar eşleşirse"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Aşağıdaki eylemleri gerçekleştir:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "Kime veya CC"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Herhangi bir başlık"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Başlığı düzenle..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "İleti gövdesi"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Komut sonucu"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Yaş"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "içeriyor"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "içermiyor"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "ise "
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "değil ise"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "regex ile eşleştir"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "regex ile eşleştirme"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "büyükse"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "küçükse"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "uzunsa"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "kısaysa"
 
@@ -5152,23 +5078,23 @@ msgstr "Komut çalıştır"
 msgid "Stop rule evaluation"
 msgstr "Kural dönüşümünü durdur"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "dizin:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Başlık listesini düzenle"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Başlıklar"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Başlık:"
 
@@ -5333,7 +5259,7 @@ msgstr "Şablonu sil"
 msgid "Do you really want to delete this template?"
 msgstr "Gerçekten bu şablonu silmek istiyor musunuz?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
@@ -5356,11 +5282,11 @@ msgstr "Kuyrutaki ileti (%d) gönderilirken hata oluştu.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Durum"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "İşlem durum penceresi oluşturuluyor...\n"
 
@@ -5372,97 +5298,66 @@ msgstr "veri alınırken bir hata oluştu.\n"
 msgid "Can't write to file.\n"
 msgstr "Dosyaya yazılamadı.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Oops: İmza doğrulanamadı"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "İmza bulunamadı"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "İyi imza"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "KÖTÜ imza"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "İmzayı kontrol etmek için genel anahtar bulunamadı"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "İmza doğrulanırken hata"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "İmzalar için farklı sonuçlar"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Hata: Bilinmeyen durum"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "\"%s\"'ten iyi imza"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "\"%s\" ten hatalı imza"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Bu anahtar için kullanıcı numarası bulunamadı."
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                aka \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "İmza atılma tarihi %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Anahtar sorgusu çıktısı: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "İmza doğrulanırken hata"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Lütfen '%s' için bir tuş seçiniz"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "'%s' için bilgi toplanıyor... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Anahtarları Seçin"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Anahtar No"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Değer"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Anahtar ekle"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Başka kullanıcı ya da anahtar numarası ekle"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Alıntı metinindeki başlıklar hatalı.\n"
@@ -5549,15 +5444,78 @@ msgstr ""
 "Varolan posta kutunuzu MH formatında kullanabilirsiniz\n"
 "Eğer emin değilseniz OK e basın."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "İmza kontrol ediliyor"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s - \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "İmza bulunamadı"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "\"%s\"'ten iyi imza"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "İyi imza"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "İmza atılma tarihi %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "\"%s\" ten hatalı imza"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "KÖTÜ imza"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "İmzayı kontrol etmek için genel anahtar bulunamadı"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH kullanılamıyor\n"
@@ -5760,255 +5718,255 @@ msgstr "Hayır."
 msgid "Creating summary view...\n"
 msgstr "Özet oluşturuluyor...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Süreç işareti"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Tüm iletiler seçiliyor..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "İşlemler için ayrım yapılıyor..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s dosyası zaten var\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Metin görünüm oluşturuluyor...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Bu mesaj görüntülenemiyor.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Bu bölümü kaydetmek için, üstteki pencerede işaretli "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "bölgeyi farenin sağ tuşu ile tıklayın ve `Farklı Kaydet'e, "
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6016,11 +5974,11 @@ msgstr ""
 "ya da `y' tuşuna basın.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Bu bölümü bir metin olarak görüntülemek için, `Metin olarak "
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6028,35 +5986,35 @@ msgstr ""
 "görüntüle'yi seçin, ya da `t' tuşuna tıklayın.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Bu bölümü harici bir programla açmak için, "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "`Aç' ya da `Birlikte aç...'ı seçin, "
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "ya da çift tıklayın, ya da "
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "`I' düğmesine basın."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Bu imza daha kontrol edilmedi.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Kontrol etmek için, içerik menüsünü\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "ile açın, sağ tıklayın ve 'İmzayı Kontrol Et'i seçin.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6092,6 +6050,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
 
+#~ msgid "OK"
+#~ msgstr "Tamam"
+
+#~ msgid "Close"
+#~ msgstr "Kapat"
+
+#~ msgid "Cancel"
+#~ msgstr "İptal"
+
+#~ msgid "No"
+#~ msgstr "Hayır"
+
+#~ msgid "Refresh"
+#~ msgstr "Yenile"
+
+#~ msgid "Search"
+#~ msgstr "Ara"
+
+#~ msgid "Apply"
+#~ msgstr "Uygula"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Oops: İmza doğrulanamadı"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "İmzalar için farklı sonuçlar"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Hata: Bilinmeyen durum"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                aka \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Anahtar sorgusu çıktısı: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Etiket bulundu: %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index bd621bcf..f7c37de7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -67,22 +67,6 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "Нехай"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "Читаємо конфігурацію для кожного запису...\n"
@@ -116,11 +100,11 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "Ім'я"
 
@@ -132,30 +116,30 @@ msgstr "Протокол"
 msgid "Server"
 msgstr "Сервер"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "Додати"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "Редагувати"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "Видалити"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Вниз"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Вгору"
@@ -164,13 +148,6 @@ msgstr "Вгору"
 msgid " Set as default account "
 msgstr " Встановити як default "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "Закрити"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "Видалити обліковий запис"
@@ -179,24 +156,15 @@ msgstr "Видалити обліковий запис"
 msgid "Do you really want to delete this account?"
 msgstr "Ви дійсно бажаєте видалити цей запис?"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "Авжеж"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+Нізащо"
 
@@ -242,29 +210,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Виконується: %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Закінчено: %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "Ввід/вивід дії"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "Послати"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "Перервати"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -275,11 +243,11 @@ msgstr ""
 "(`%%h' буде замінено аргументом)\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "Прихований аргумент користувача"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -290,7 +258,7 @@ msgstr ""
 "(`%%u' буде замінено аргументом)\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "Аргумент користувача"
 
@@ -298,13 +266,13 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "Нотатки"
 
@@ -312,24 +280,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "Скасувати"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/Файл"
@@ -350,8 +301,8 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _Server"
 msgstr "/Файл/Новий сервер"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -369,7 +320,7 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
@@ -401,7 +352,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -410,12 +361,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -432,7 +383,7 @@ msgstr "/Нова група"
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -442,7 +393,7 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/Редагувати"
@@ -455,18 +406,18 @@ msgstr "/Видалити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "Ім'я:"
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "Видалити"
 
@@ -495,18 +446,6 @@ msgstr "Видалити адресу(и)"
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "Ні"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -617,7 +556,7 @@ msgstr "Помилка при конвертуванні адресної кни
 msgid "Addressbook Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "Інтерфейс"
 
@@ -661,351 +600,351 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "Помилка"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "Створення діалогу термінового попередження...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "Показати це повідомлення наступного разу"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "Оранжевий"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "Червоний"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "Рожевий"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "Блакитний"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "Синій"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "Зелений"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "Коричневий"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "Ніякий"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/Файл/Послати"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/Файл/Послати пізніше"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти в папці чорновиків"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Undo"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/Редагувати/Advanced"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Редагувати/Advanced/На літеру назад"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Редагувати/Advanced/На літеру вперед"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Редагувати/Advanced/На слово назад"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Редагувати/Advanced/На слово вперед"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Редагувати/Advanced/На початок рядка"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Редагувати/Advanced/На кінець рядка"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Редагувати/Advanced/На попередній рядок"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Редагувати/Advanced/На наступний рядок"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Редагувати/Advanced/Видалити літеру назад"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Редагувати/Advanced/Видалити літеру вперед"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Редагувати/Advanced/Видалити слово назад"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Редагувати/Advanced/Видалити слово вперед"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Редагувати/Advanced/Видалити рядок"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Редагувати/Advanced/Видалити до кінця рядка"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Згорнути поточний абзац"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Згорнути всі довгі рядки"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [Редагований]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "Створити лист%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "Послати"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1013,26 +952,26 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1043,138 +982,138 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати?"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "не вдалось записати заголовки\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "тип MIME"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "Чорновик"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чорновиків"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "Приєднати файл"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "Підпис"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "Вставити підпис"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1185,66 +1124,66 @@ msgstr ""
 "Примусово обірвати процес?\n"
 "group id процесу: %d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Обірвано процес з group id: %d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Тимчасовий файл: %s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "Створення: ввід від спостерігаючого процесу\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "Не вдалось запустити зовнішній редактор\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "Не вдалось записати в файл\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Не вдалось прочитати з каналу\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "Відмовитись від листа"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "Цей лист було змінено. Відмовитись від нього?"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "Відмовитись"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "В чорновики"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "Замінити"
 
@@ -1252,77 +1191,76 @@ msgstr "Замінити"
 msgid "Edit address"
 msgstr "Редагувати адресу"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "Додати нову особу"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "Редагувати подробиці про особу"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "Адреса e-mail обов'язкова."
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "Потрібно надати ім'я та значення."
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "Редагувати особисті дані"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "Ім'я для списку"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "Прізвище"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "Ім'я"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "Прізвисько"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "Адреса e-mail"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "Синонім"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "Вгору"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "Вниз"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "Змінити"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "Значення"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "Основні дані"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "Атрибути користувача"
 
@@ -1338,7 +1276,7 @@ msgstr "Файл не скидається на придатний формат
 msgid "Could not read file."
 msgstr "Не вдалось прочитати файл."
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "Редагувати адресну книгу"
 
@@ -1351,7 +1289,7 @@ msgstr " Перевірити файл "
 msgid "File"
 msgstr "Файл"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "Додати нову адресну книгу"
 
@@ -1383,32 +1321,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "Наявні адреси"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Перемістити адреси e-mail з чи в групу кнопкою з стрілкою"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "Редагувати подробиці про групу"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "Додати нову групу"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "Редагувати папку"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -1420,11 +1358,11 @@ msgstr "Файл не схожий на формат JPilot."
 msgid "Select JPilot File"
 msgstr "Обрати файл JPilot"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1433,7 +1371,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "Додаткові пункти адреси e-mail"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "Додати новий запис JPilot"
 
@@ -1441,63 +1379,63 @@ msgstr "Додати новий запис JPilot"
 msgid "Connected successfully to server"
 msgstr "Успішне з'єднання з сервером"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "Не вдалось з'єднатись з сервером"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "Налаштування сервера LDAP"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "Ім'я вузла"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "Порт"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " Перевірити сервер"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "База пошуку"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "Критерії пошуку"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " Перезапуск "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "Повне ім'я для підключення"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "Пароль для підключення"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "Таймаут (с)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "Основні"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "Розширені"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "Додати новий сервер LDAP"
 
@@ -1509,7 +1447,7 @@ msgstr "Налаштування LDAP - вибір бази пошуку"
 msgid "Available Search Base(s)"
 msgstr "Наявна(і) база(и) пошуку"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "Не вдалось прочитати базу пошуку з сервера - встановіть власноручно"
 
@@ -1521,11 +1459,11 @@ msgstr "Файл не схожий на формат vCard."
 msgid "Select vCard File"
 msgstr "Оберіть файл vCard"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "Редагувати запис vCard"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "Додати новий запис vCard"
 
@@ -1554,10 +1492,10 @@ msgstr " Обрати... "
 msgid "Select exporting file"
 msgstr "Оберіть файл для експорту"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "не вдалось записати конфігурацію в файл\n"
 
@@ -1565,41 +1503,41 @@ msgstr "не вдалось записати конфігурацію в фай�
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -1661,64 +1599,64 @@ msgstr "Непрочитані"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "Перебудовуємо всі дерева папок..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1728,16 +1666,16 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1746,24 +1684,24 @@ msgstr ""
 "Всі папки і листи в `%s' буде видалено.\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1772,34 +1710,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -1831,10 +1769,6 @@ msgstr "Статтей"
 msgid "Type"
 msgstr "Тип"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "Освіжити"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "модерована"
@@ -1847,15 +1781,15 @@ msgstr "тільки для читання"
 msgid "unknown"
 msgstr "невідомо"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "Не вдалось отримати список конференцій"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "Виконано."
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "%d конференцій отримано (%s прочитано)"
@@ -1872,11 +1806,11 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(Без відправника)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -2109,7 +2043,7 @@ msgstr "Ім'я атрибута"
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "Обрати"
 
@@ -2133,7 +2067,7 @@ msgstr "Імпортувати файл LDIF в адресну книгу"
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "Далі"
 
@@ -2149,133 +2083,133 @@ msgstr "Атрибути"
 msgid "Finish"
 msgstr "Закінчити"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "Виконано (немає нових листів)"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2284,27 +2218,27 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Помилка сокета."
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2313,11 +2247,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2326,15 +2260,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -2352,7 +2286,7 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2361,11 +2295,11 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread не підтримується glib.\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2373,16 +2307,16 @@ msgstr ""
 "GnuPG не встановлено належно, або надто стара версія.\n"
 "Відключено підтримку OpenPGP."
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Вживання: %s [ОПЦІЇ]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    відкрити вікно для нового листа"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2392,23 +2326,23 @@ msgstr ""
 "                         відкрити вікно створення з приєднанням вказаних\n"
 "                         файлів"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              отримати нові листи"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          отримати нові листи для всіх записів"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 відіслати всі відкладені листи"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   показати загальну кількість листів"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2416,40 +2350,40 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         показати стан кожної папки"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим відлагодження"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 показати цю довідку і вийти"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              видати інформацію про версію і вийти"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "Є незавершені листи. Справді вийти?"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "Листи в черзі"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфігурування дій"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3090,58 +3024,58 @@ msgstr "/Довідка/FAQ/Італійський"
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Спорожнити кошик"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3151,16 +3085,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3170,141 +3104,141 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "Отримати"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "Отримати нові листи"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "Отримати всі"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "Отримати нові листи для всіх записів"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Створення листа"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "Новий лист"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "Відповісти"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "Відповісти на лист"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "Відповісти всім"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "Переслати"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "Переслати лист"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "Видалити лист"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "Наступний непрочитаний лист"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "Налаштування запису"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
@@ -3406,10 +3340,6 @@ msgstr "Враховувати регістр"
 msgid "Backward search"
 msgstr "Пошук назад"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "Пошук"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "Невдача пошуку"
@@ -3434,28 +3364,28 @@ msgstr "Пошук закінчено"
 msgid "Creating message view...\n"
 msgstr "Створюємо область перегляду листа...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "Зберегти як"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "Переписати"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "Писати поверх існуючого файла?"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3464,7 +3394,7 @@ msgstr ""
 "Введіть команду друку:\n"
 "(`%s' буде замінено іменем файла)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3524,7 +3454,7 @@ msgstr "Створюємо область перегляду MIME...\n"
 msgid "MIME Type"
 msgstr "Тип MIME"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "Текст"
 
@@ -3536,15 +3466,15 @@ msgstr "Вкладення"
 msgid "Select \"Check signature\" to check"
 msgstr "Оберіть \"Перевірити підпис\", щоб зробити це"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "Не вдалось зберегти одну з частин листа."
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "Відкрити з"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3553,7 +3483,7 @@ msgstr ""
 "Введіть команду для відкриття файла:\n"
 "(`%s' буде замінено на його ім'я)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "Командний рядок переглядача MIME невірний: `%s'"
@@ -3658,15 +3588,15 @@ msgstr "Трапилась помилка при відсиланні\n"
 msgid "Error occurred while sending command\n"
 msgstr "При відсиланні команди трапилась помилка\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "Пароль"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[нема id користувача]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3679,7 +3609,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3687,70 +3617,66 @@ msgstr ""
 "Поганий пароль! Пробуємо знову...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "У привітанні не знайдено обов'язкового APOP timestamp\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Синтаксична помилка в timestamp у привітанні\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "Помилка протоколу POP3\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "невірна відповідь UIDL: %s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: Вилучаємо застарілий лист %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: Пропускаємо лист %d (%d байтів)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "скриньку заблоковано\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "таймаут сесії\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "не вдалось почати сесію TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "помилка при аутентифікації\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "команда не підтримується\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "помилка під час сесії POP3\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "Знайдено %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "Застосувати"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "Відкриття вікна опцій account'а...\n"
@@ -3772,11 +3698,11 @@ msgstr "Налаштування запису"
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3886,7 +3812,7 @@ msgstr "Завантажити всі листи на сервері"
 msgid "Receive size limit"
 msgstr "Обмеження розміру отриманих листів"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr "Кб"
 
@@ -3906,7 +3832,7 @@ msgstr "(Тут складаємо невідфільтровані листи)"
 msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -3914,7 +3840,7 @@ msgstr "Автоматично"
 msgid "`Get all' checks for new messages on this account"
 msgstr "Перевіряти за командою `Отримати всі'"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "Заголовок"
 
@@ -3930,7 +3856,7 @@ msgstr "Генерувати Message-ID"
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr " Редагувати... "
 
@@ -4125,19 +4051,19 @@ msgstr ""
 "режим для шифрованих листів. Він не відповідає\n"
 "RFC 3156 - MIME Security with OpenPGP."
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "Конфігурування дій"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "Назва меню:"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "Командний рядок:"
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4177,43 +4103,43 @@ msgstr ""
 "   %h для прихованого аргументу, наданого користувачем\n"
 "   %s для текстового виділення"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr "Замінити"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr "Синтаксична довідка"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "Зареєстровані дії"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(Новий)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "Назву меню не задано."
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "Двокрапка ':' заборонена в назві меню."
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "Надто довга назва меню."
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "Не задано командний рядок."
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "Надто довгі назва меню і команда."
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4224,91 +4150,91 @@ msgstr ""
 "%s\n"
 "- синтаксична помилка."
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "Видалити дію"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "Ви дійсно бажаєте видалити цю дію?"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "Створюємо вікно загальних опцій...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "Загальні налаштування"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "Цитування"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "Відображення"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "Інше"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "Зовнішня програма"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "Вживати зовнішню програму для прийому"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "Команда"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "Локальний спул"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "Приймати зі спулу"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "Фільтрувати при прийомі"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Шлях до спулу"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "кожні"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "хвилин"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "Перевіряти нову пошту при запуску"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "Оновлювати всі локальні папки після прийому"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4316,115 +4242,115 @@ msgstr ""
 "Максимальна кількість статей для завантаження\n"
 "(необмежена, якщо вказано 0)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "Вживати зовнішню програму для відсилання"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "Зберігати відіслані листи в outbox"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "Кодова таблиця для вихідної пошти"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "Автоматична (рекомендовано)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "Західноєвропейська (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "Цнтральноєвропейська (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтійська (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтійська (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилиця (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4432,11 +4358,11 @@ msgstr ""
 "Якщо включено `Автоматична', буде обрано оптимальне\n"
 "кодування для діючої locale."
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "Кодування пересилки"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
@@ -4444,115 +4370,115 @@ msgstr ""
 "Вкажіть Content-Transfer-Encoding для вживання,\n"
 "якщо тіло листа містить не-ASCII символи."
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "Розділювач підпису"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "Вставити автоматично"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "Автоматично запускати зовнішній редактор"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "Рівень Undo"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "Згортати рядки листів після"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "символів"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "Згортати цитування"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "Згорнути при вводі"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "Згортати перед відсиланням"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "Автоматично вибирати запис для відповідей"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "Цитувати лист при відповіді"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "Кнопка відповіді запускає відповідь конференції"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "Формат відповіді"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "Знак цитати"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "Формат пересилання"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " Опис символів "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Перекладати назви полів заголовка (як `From:', `Subject:')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "Показувати кількість непрочитаного після назви папки"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скорочувати назви конференцій, довші ніж"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "літер"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "Список повідомлень"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "Формат дати"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " Показувати наступні поля... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "Дозволити розфарбування листів"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4560,63 +4486,63 @@ msgstr ""
 "Відображати 2-байтний алфавіт і числа\n"
 "однобайтним символом (для японської мови)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "Показувати панель заголовка над листом"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "Показувати скорочені заголовки при перегляді листів"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "Міжрядковий інтервал"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "пікселів"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "Півсторінки"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "Плавна прокрутка"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабувати приєднані картинки відповідно до вікна"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "Автоматично перевіряти підписи"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "Показувати результат перевірки підпису у спливаючому вікні"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "Тимчасово зберігати пароль в пам'яті"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "Недійсний після"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "хвилин "
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4624,35 +4550,35 @@ msgstr ""
 "(Присвоєння '0' зберігає пароль протягом\n"
 " всієї сесії)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "Захопити ввід при введенні паролю"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Попереджати при запуску, якщо GnuPG не працює"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "Завжди відкривати листи у списку при виділенні"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "Відкривати перший непрочитаний лист, входячи в папку"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "Переходити у папку `Вхідні', отримавши нову пошту"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Виконувати негайно після видалення чи переміщення листів"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
@@ -4660,216 +4586,216 @@ msgstr ""
 "(Листи буде позначено до виконання,\n"
 " якщо це вимкнути)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "Діалог отримання"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "Показувати діалог отримання"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "Завжди"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "Тільки при ручному отриманні"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "Не видавати діалог при помилці отримання"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "Закрити діалог отримання після завершення"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " Встановити гарячі клавіші... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "Додати адресу до призначення, коли клацнути двічі"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "При виході"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "Підтвердити при виході"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "При виході очищати кошик"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "Питати перед очищенням"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "Попереджати, якщо є листи в черзі"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета вводу/виводу"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4893,11 +4819,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4911,7 +4837,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4923,15 +4849,15 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "Вибір шрифта"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4941,31 +4867,31 @@ msgstr ""
 "Ви також можете змінити кожен shortcut меню, натиснувши\n"
 "будь-яку(і) клавішу(і), тримаючи вказівник миші на пункті."
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "По замовчуванню"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "Власні налаштування заголовка"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "Власні заголовки"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "Назву заголовка не задано."
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "Видалити заголовок"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "Справді бажаєте видалити цей заголовок?"
 
@@ -4973,143 +4899,143 @@ msgstr "Справді бажаєте видалити цей заголовок
 msgid "Creating display header setting window...\n"
 msgstr "Створюємо вікно налаштування заголовка...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "Налаштування відображення заголовка"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "Назва заголовка"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "Показані заголовки"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "Приховані заголовки"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "Показати всі неперераховані заголовки"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "Читаємо конфігурацію показу заголовків...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "Пишемо конфігурацію показу заголовків...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "Заголовок вже в списку."
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "Налаштування фільтра"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "Ввімкнено"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "Верх"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "Низ"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "Видалити правило"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "Справді бажаєте видалити це правило?"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "Правило фільтрування"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "Якщо виконано будь-яку з умов"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "Якщо виконано всі умови"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "Виконати такі дії:"
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "Кому або Копія"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "Кожен заголовок"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "Редагувати заголовок..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "Тіло повідомлення"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "Результат команди"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "Давність"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "містить"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "не містить"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "є"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "не є"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "відповідає регулярному виразу"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "не відповідає регулярному виразу"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "більш ніж"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "менш ніж"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "довше, ніж"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "коротше, ніж"
 
@@ -5157,23 +5083,23 @@ msgstr "Виконати команду"
 msgid "Stop rule evaluation"
 msgstr "Припинити обчислення правила"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "папка:"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "адреса:"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "Редагувати список заголовків"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "Заголовки"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "Заголовок:"
 
@@ -5338,7 +5264,7 @@ msgstr "Видалити шаблон"
 msgid "Do you really want to delete this template?"
 msgstr "Справді видалити цей шаблон?"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
 
@@ -5361,11 +5287,11 @@ msgstr "Не вдалось відіслати лист %d з черги.\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "Стан"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "Створюємо діалогове вікно прогресу...\n"
 
@@ -5377,97 +5303,66 @@ msgstr "трапилась помилка при отриманні даних.\
 msgid "Can't write to file.\n"
 msgstr "Не вдалось писати в файл.\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "Підпис не перевірено"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "Підпису не знайдено"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "Гарний підпис"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "ПОГАНИЙ підпис"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "Немає публічного ключа для перевірки підпису"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "Помилка при перевірці підпису"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "Різні результати перевірки підписів"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "Помилка: невідомий стан"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Гарний підпис від \"%s\""
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "ПОГАНИЙ підпис від \"%s\""
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "Не вдалось знайти ID користувача для цього ключа"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "       також званий \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "Підпис створений %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "Відбиток ключа: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "Помилка при перевірці підпису"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "Оберіть, будь-ласка, ключ для `%s'"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "Збираємо інформацію про `%s' ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "Обрати ключі"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "Ідентифікатор ключа"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "Val"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "Додати ключ"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "Введіть іншого користувача або ідентифікатор ключа:"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "Заголовок листа з черги зіпсовано.\n"
@@ -5555,15 +5450,78 @@ msgstr ""
 "вона у вас є.\n"
 "Якщо не впевнені, просто натисніть `Нехай'."
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "Перевіряємо підпис"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr "%s%s%s від \"%s\""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "Підпису не знайдено"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Гарний підпис від \"%s\""
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "Гарний підпис"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "Підпис створений %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "ПОГАНИЙ підпис від \"%s\""
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "ПОГАНИЙ підпис"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "Немає публічного ключа для перевірки підпису"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH недоступна\n"
@@ -5768,255 +5726,255 @@ msgstr "Номер"
 msgid "Creating summary view...\n"
 msgstr "Створюємо область перегляду списка...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "Обробка позначок"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "Залишились деякі позначки. Опрацювати?"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(Без дати)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "Обираємо всі листи..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "Скасування ниток обговорення для виконання..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s вже існує\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "Створюємо область перегляду тексту...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "Щоб зберегти цю частину, викличте контекстне меню "
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "правою кнопкою миші і оберіть `Зберегти як...'"
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6024,11 +5982,11 @@ msgstr ""
 "або натисніть клавішу `y'.\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "Щоб показати цю частину як текстове повідомлення,"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -6036,35 +5994,35 @@ msgstr ""
 "оберіть `Показати як текст', або натисніть кнопку `t'.\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "Щоб відкрити цю частину з допомогою зовнішньої "
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "програми, оберіть `Відкрити' чи `Відкрити з...',"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "або клацніть двічі чи середньою кнопкою миші,"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "або натисніть клавішу `l'."
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "Підпис ще не перевірено.\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "Щоб перевірити його, викличте контекстне меню\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "правою кнопкою і оберіть `Перевірити підпис'.\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6100,6 +6058,42 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
 
+#~ msgid "OK"
+#~ msgstr "Нехай"
+
+#~ msgid "Close"
+#~ msgstr "Закрити"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid "No"
+#~ msgstr "Ні"
+
+#~ msgid "Refresh"
+#~ msgstr "Освіжити"
+
+#~ msgid "Search"
+#~ msgstr "Пошук"
+
+#~ msgid "Apply"
+#~ msgstr "Застосувати"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "Підпис не перевірено"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "Різні результати перевірки підписів"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "Помилка: невідомий стан"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "       також званий \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "Відбиток ключа: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Знайдено мітку: %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fec4a8cb..abea4ac0 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: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2002-03-19 14:00+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -62,22 +62,6 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "确定"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
@@ -109,11 +93,11 @@ msgid ""
 msgstr "按照该顺序检查新邮件。选中 `G' 列的复选框，在`全部接收'时检查。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "名称"
 
@@ -125,30 +109,30 @@ msgstr "协议"
 msgid "Server"
 msgstr "服务器"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "添加"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "编辑"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr " 删除 "
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "向下"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "向上"
@@ -157,13 +141,6 @@ msgstr "向上"
 msgid " Set as default account "
 msgstr " 设为默认帐号 "
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "关闭"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "删除帐号"
@@ -172,24 +149,15 @@ msgstr "删除帐号"
 msgid "Do you really want to delete this account?"
 msgstr "您真的要删除该帐号吗？"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+否"
 
@@ -235,29 +203,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行：%s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 结束：%s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "动作的输入/输出"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "发送"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "终止"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -267,11 +235,11 @@ msgstr ""
 "输入打印命令行：\n"
 "( `%s '将被替换为文件名)"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -281,7 +249,7 @@ msgstr ""
 "输入打印命令行：\n"
 "( `%s '将被替换为文件名)"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr ""
 
@@ -289,13 +257,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "注释"
 
@@ -303,24 +271,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "取消"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -341,8 +292,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -360,7 +311,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -392,7 +343,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -401,12 +352,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -423,7 +374,7 @@ msgstr "/新建组(_G)"
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -433,7 +384,7 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/编辑(_E)"
@@ -446,18 +397,18 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "姓名："
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "删除"
 
@@ -486,18 +437,6 @@ msgstr "删除地址"
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "否"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -605,7 +544,7 @@ msgstr "地址簿转换错误"
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "界面"
 
@@ -649,360 +588,360 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "错误"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "正在创建提醒面板对话框...\n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "下次还显示该信息"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "橙色"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "红色"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "紫色"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "天蓝色"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "蓝色"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "绿色"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "棕色"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:460
+#: src/compose.c:456
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/compose.c:462
+#: src/compose.c:458
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/邮件(_M)/以后发送(_l)"
 
-#: src/compose.c:465
+#: src/compose.c:461
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/邮件(_M)/保存到草稿夹(_d)"
 
-#: src/compose.c:467
+#: src/compose.c:463
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/邮件(_M)/保存并继续编辑(_k)"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/粘附文件(_A)"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_g)"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_c)"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引用粘贴(_q)"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/向后移动一个字符"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/向前移动一个字符"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/向后移动一个单词"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/向前移动一个单词"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移至行首"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移至行尾"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移至上一行"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移至下一行"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/回删一个字符"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "编辑(_E)/高级(_d)/前删一个字符"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/回删一个单词"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "编辑(_E)/高级(_d)/前删一个单词"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "编辑(_E)/高级(_d)/删除一行"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "编辑(_E)/高级(_d)/删除至行尾"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_l)"
 
-#: src/compose.c:562
+#: src/compose.c:558
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/复制(_c)"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_u)"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_n)"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:580
+#: src/compose.c:576
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/编辑(_E)/用外部编辑器编辑(_x)"
 
-#: src/compose.c:584
+#: src/compose.c:580
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/动作(_n)"
 
-#: src/compose.c:585
+#: src/compose.c:581
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/邮件(_M)/加密(_E)"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "%s：无法得到文本部分\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "无法获得多部分邮件的该部分。"
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [已编辑]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "撰写邮件%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1010,26 +949,26 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "不能找到和当前选中的钥匙标识 `%s' 相联系的钥匙"
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1039,139 +978,139 @@ msgstr ""
 "无法转换邮件的编码。\n"
 "仍然发送吗？"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "无法写邮件头\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME 类型"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "加入附件"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 #, fuzzy
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "编码"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：`%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1182,66 +1121,66 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "丢弃邮件"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "放入草稿箱"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板 `%s' 吗？"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "替代"
 
@@ -1249,77 +1188,76 @@ msgstr "替代"
 msgid "Edit address"
 msgstr "编辑地址"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "添加新联系人"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "编辑联系人详细信息"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "必须输入电子邮件地址。"
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "必须输入名字和值。"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "编辑联系人信息"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "显示姓名"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "姓氏"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "名字"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "昵称"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "别名"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "向上"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "向下"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "修改"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "值"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "基本信息"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "用户属性"
 
@@ -1335,7 +1273,7 @@ msgstr "文件不是正确的地址簿格式。"
 msgid "Could not read file."
 msgstr "无法读取文件。"
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "编辑地址簿"
 
@@ -1348,7 +1286,7 @@ msgstr " 检查文件 "
 msgid "File"
 msgstr "文件"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "添加新地址簿"
 
@@ -1380,32 +1318,32 @@ msgstr " <- "
 msgid "Available Addresses"
 msgstr "可用邮件地址"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "编辑群组细节"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -1417,11 +1355,11 @@ msgstr "文件不象是 JPilot 格式。"
 msgid "Select JPilot File"
 msgstr "选择 JPilot 文件"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr " ... "
@@ -1430,7 +1368,7 @@ msgstr " ... "
 msgid "Additional e-Mail address item(s)"
 msgstr "其它邮件地址项"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "添加新 JPilot 项"
 
@@ -1438,63 +1376,63 @@ msgstr "添加新 JPilot 项"
 msgid "Connected successfully to server"
 msgstr "成功连接到服务器"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "无法连接到服务器"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "编辑LDAP服务器"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "主机名"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "端口"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr " 检查服务器 "
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr "搜索起点"
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr "搜索条件"
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr " 重新设置 "
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr "绑定 DN"
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr "绑定密码"
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr "超时(秒)"
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "扩展"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "添加新的LDAP服务器"
 
@@ -1506,7 +1444,7 @@ msgstr "编辑LDAP－选择搜索起点"
 msgid "Available Search Base(s)"
 msgstr "可用的搜索起点"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "无法从服务器读取搜索起点－请手工设置"
 
@@ -1518,11 +1456,11 @@ msgstr "文件不象是 vCard 格式。"
 msgid "Select vCard File"
 msgstr "选择 vCard 文件"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "编辑 vCard 项"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "添加新 vCard 项"
 
@@ -1551,10 +1489,10 @@ msgstr " 选择... "
 msgid "Select exporting file"
 msgstr "选择导出文件"
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
 
@@ -1562,41 +1500,41 @@ msgstr "无法写入配置文件\n"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符 `%c' 不能包含在文件夹名字中。"
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹 `%s' 已存在。"
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹 `%s'。"
@@ -1660,68 +1598,68 @@ msgstr "未读"
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/重新扫描文件夹树"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "正在重新扫描文件夹..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "正在重新扫描文件夹..."
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 #, fuzzy
 msgid "Rebuilding all folder trees..."
 msgstr "正在重新扫描文件夹树..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "/正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在发送邮件"
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1731,16 +1669,16 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加 `/ ')"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入 `%s '的新名字："
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1749,24 +1687,24 @@ msgstr ""
 " `%s '下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "无法删除文件夹 `%s '。"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1775,34 +1713,34 @@ msgstr ""
 "真的要删除邮件箱 `%s '？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号 `%s '？"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组 `%s '？"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号 `%s '？"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -1834,10 +1772,6 @@ msgstr "邮件数"
 msgid "Type"
 msgstr "类型"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "刷新"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "监管"
@@ -1850,15 +1784,15 @@ msgstr "只读"
 msgid "unknown"
 msgstr "未知"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "完成。"
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 个新闻组(已读取 %s)"
@@ -1875,11 +1809,11 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "(没有发件人)"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -2117,7 +2051,7 @@ msgstr "属性名"
 msgid "Attribute"
 msgstr "属性"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "选择"
 
@@ -2141,7 +2075,7 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "下一个"
 
@@ -2157,196 +2091,196 @@ msgstr "属性"
 msgid "Finish"
 msgstr "完成"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/inc.c:535
+#: src/inc.c:536
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "没有新邮件"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:559
+#: src/inc.c:560
 #, fuzzy
 msgid "Timeout"
 msgstr "超时(秒)"
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d 个新邮件\n"
 
-#: src/inc.c:612
+#: src/inc.c:613
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "/检查新邮件(_C)"
 
-#: src/inc.c:621
+#: src/inc.c:622
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s ..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件到 %s...\n"
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 #, fuzzy
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 #, fuzzy
 msgid "Can't write file."
 msgstr "无法写入文件。\n"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 #, fuzzy
 msgid "Socket error."
 msgstr "Socket错误\n"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "信箱设置"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱设置"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 #, fuzzy
 msgid "Authentication failed."
 msgstr "验证方法"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "验证方法"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -2364,7 +2298,7 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议日志"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2373,11 +2307,11 @@ msgstr ""
 "文件 `%s '已存在。\n"
 "无法创建文件件。"
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支持 g_thread。\n"
 
-#: src/main.c:249
+#: src/main.c:262
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2386,16 +2320,16 @@ msgstr ""
 "没有正确安装 GnuPG。\n"
 "已禁用 OpenPGP 支持。"
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2404,64 +2338,64 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         用指定的附带文件打开撰写窗口"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:412
+#: src/main.c:430
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示邮件总数"
 
-#: src/main.c:413
+#: src/main.c:431
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               显示邮件总数"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "排队的邮件"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "正在写动作配置文件...\n"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3117,58 +3051,58 @@ msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 到 %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 #, fuzzy
 msgid "Empty all trash"
 msgstr "清空废件箱"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3177,16 +3111,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱 `%s '已经存在。"
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3195,144 +3129,144 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/回复发件人(_y)"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/全部回复(_l)"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "作为附件转发(_w)"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/重新编辑(_t)"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "接收"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "合并新邮件"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "合并所有帐号的新邮件"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰写"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "回复"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "回复该邮件"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "回复给所有人"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "转发"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "转发该邮件"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "执行"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "下一个未读的邮件"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "帐号"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "帐号设置"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "退出程序"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
@@ -3434,10 +3368,6 @@ msgstr "区分大小写"
 msgid "Backward search"
 msgstr "向前搜索"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "搜索"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "搜索失败"
@@ -3462,28 +3392,28 @@ msgstr "搜索结束"
 msgid "Creating message view...\n"
 msgstr "创建邮件视图...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "另存为"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "覆盖已存在的文件？"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件 `%s '。"
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3492,7 +3422,7 @@ msgstr ""
 "输入打印命令行：\n"
 "( `%s '将被替换为文件名)"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3552,7 +3482,7 @@ msgstr "正在创建MIME视图...\n"
 msgid "MIME Type"
 msgstr "MIME类型"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "文本"
 
@@ -3564,15 +3494,15 @@ msgstr "附件"
 msgid "Select \"Check signature\" to check"
 msgstr "选择 \"检查签名\"来检查"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "无法保存多部分邮件的该部分。"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "打开用"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3581,7 +3511,7 @@ msgstr ""
 "输入打开文件的命令行：\n"
 "( `%s '将被替换为文件名)"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME察看器命令行无效： `%s '"
@@ -3687,15 +3617,15 @@ msgstr "发文章时发生错误\n"
 msgid "Error occurred while sending command\n"
 msgstr "处理邮件时发生错误。"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "口令串"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[没有用户标识]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3708,7 +3638,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3716,73 +3646,69 @@ msgstr ""
 "错误的口令串！重试...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在问候信息中没有发现需要的APOP时戳\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "在问候信息中时间戳语法错误\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 协议错误\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, fuzzy, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "无效的 xover 行：%s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 正在删除过期邮件 %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3：跳过邮件 %d (%d 字节)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 #, fuzzy
 msgid "mailbox is locked\n"
 msgstr "信箱设置"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr ""
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "不能开始TLS会话\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "验证时发生错误\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 #, fuzzy
 msgid "command not supported\n"
 msgstr "命令"
 
-#: src/pop.c:685
+#: src/pop.c:680
 #, fuzzy
 msgid "error occurred on POP3 session\n"
 msgstr "验证时发生错误\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "发现 %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "保存配置文件。\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "应用"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
@@ -3804,11 +3730,11 @@ msgstr "帐号首选项"
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "隐私"
 
@@ -3918,7 +3844,7 @@ msgstr "下载服务器上的所有邮件"
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3938,7 +3864,7 @@ msgstr "(没有过滤的邮件会保存在该文件夹中)"
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "自动"
 
@@ -3946,7 +3872,7 @@ msgstr "自动"
 msgid "`Get all' checks for new messages on this account"
 msgstr " `全部接收 '时检查该帐号的新邮件"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "邮件头"
 
@@ -3962,7 +3888,7 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "编辑... "
 
@@ -4155,20 +4081,20 @@ msgid ""
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 #, fuzzy
 msgid "Actions configuration"
 msgstr "正在写动作配置文件...\n"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "菜单名"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "命令行："
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 #, fuzzy
 msgid ""
 "Menu name:\n"
@@ -4204,44 +4130,44 @@ msgstr ""
 "     %F 表示已选择的邮件文件列表\n"
 "     %p 表示选择的部分。"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 #, fuzzy
 msgid " Replace "
 msgstr "替代"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr " 语法帮助 "
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "已注册的动作"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "(新建)"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "没有设置菜单名。"
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "在菜单名中不允许有冒号 ':'。 "
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "菜单名太长。"
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "没有设置命令行。"
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "菜单名和命令太长。"
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4252,91 +4178,91 @@ msgstr ""
 "%s\n"
 "有一个语法错误。"
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "删除动作"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "正在创建通用首选项窗口...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "通用首选项"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "引文"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "外部程序"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "本地邮件池"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr ""
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4344,115 +4270,115 @@ msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "发送时使用的字符集"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4460,190 +4386,190 @@ msgstr ""
 "如果选择 `自动 '，将使用最适合当前区域设置\n"
 "的编码。"
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "发送前折行"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr ""
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "输入行折行"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "发送前折行"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/全部回复(_l)"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "引文符号"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "字体"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "翻译邮件头名(如 `发件人： '、 `主题： ')"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名旁显示未读邮件的数量"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "新闻组缩写长于"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "信件"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己， `发件人 '栏中显示的是收件人"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "用单字节字符显示双字节字母和数字"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "在邮件视图之上显示简短的邮件头"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "把密码临时存放在内存中"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "之后过期"
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "分钟"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
@@ -4651,253 +4577,253 @@ msgstr ""
 "(设置 '0' 储存密码\n"
 "为整个工作)"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 不工作，在启动时显示警告"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "没有选择邮件文件。"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时先打开未读的邮件"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
 msgstr "(如果该选项关闭，标记邮件直到完成执行)"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 #, fuzzy
 msgid "Receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "在收到错误时不弹出错误对话框"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加到收件人中"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "在退出时清空废件箱"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "世纪(年/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4921,11 +4847,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4939,7 +4865,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4951,15 +4877,15 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "字体选择"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4969,31 +4895,31 @@ msgstr ""
 "您也可以将鼠标放在菜单项上并按下任何键\n"
 "(或组合键)来修改菜单快捷键。"
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "自定义邮件头设置"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "自定义邮件头"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "没有设置邮件头名。"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "删除邮件头"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "您确实想删除该邮件头吗？"
 
@@ -5001,150 +4927,150 @@ msgstr "您确实想删除该邮件头吗？"
 msgid "Creating display header setting window...\n"
 msgstr "正在创建邮件头显示设置的窗口...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "邮件头显示设置"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "邮件头名"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "显示的邮件头"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "隐藏的邮件头"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "显示所有没有指定的邮件头"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "正在读取邮件头显示配置...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "正在写邮件头显示配置...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "该邮件头已经在列表中。"
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "过滤设定"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 #, fuzzy
 msgid "Top"
 msgstr "收件人："
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr ""
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 #, fuzzy
 msgid "Copy"
 msgstr "/复制(_C)..."
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "删除规则"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "您确实想要删除该规则吗？"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 #, fuzzy
 msgid "Filter rule"
 msgstr "删除规则"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 #, fuzzy
 msgid "Any header"
 msgstr "隐藏的邮件头"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 #, fuzzy
 msgid "Edit header..."
 msgstr "邮件头"
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "Message body"
 msgstr "邮件"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 #, fuzzy
 msgid "doesn't contain"
 msgstr "不包含"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr ""
 
@@ -5201,27 +5127,27 @@ msgstr "执行"
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 #, fuzzy
 msgid "folder:"
 msgstr "文件夹"
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 #, fuzzy
 msgid "address:"
 msgstr "地址"
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 #, fuzzy
 msgid "Edit header list"
 msgstr "邮件头"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 #, fuzzy
 msgid "Headers"
 msgstr "邮件头"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 #, fuzzy
 msgid "Header:"
 msgstr "邮件头"
@@ -5394,7 +5320,7 @@ msgstr "删除模板"
 msgid "Do you really want to delete this template?"
 msgstr "您确实想删除该模板吗？"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
@@ -5417,11 +5343,11 @@ msgstr "发送排队的邮件 %d 失败。\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效： `%s '\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "状态"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr "正在创建进度对话框...\n"
 
@@ -5433,97 +5359,66 @@ msgstr "下载数据时发生错误。\n"
 msgid "Can't write to file.\n"
 msgstr "无法写入文件。\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "呀：签名没有验证"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "没有找到签名"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "正确的签名"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "错误的签名"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "没有公钥来验证签名"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "验证签名时发生错误"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "不同的签名结果"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "错误：未知的状态"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "来自 `%s '的正确签名"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "来自 \"%s\" 的错误签名"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "无法为该密钥找到用户标识。"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                也就是 `%s '\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "签名创建时间 %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "密钥指纹：%s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "验证签名时发生错误"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "请选择 `%s '的密钥"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "收集 `%s '的信息...%c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "选择密钥"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "密钥标识"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "值"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "添加密钥"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "输入另外的用户或密钥标识："
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "排队的邮件头损坏。\n"
@@ -5613,15 +5508,78 @@ msgstr ""
 "假如您确实有已经有一个。\n"
 "假如您无法肯定，那么请单击 `确定 '。"
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "检查签名"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "没有找到签名"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "来自 `%s '的正确签名"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "正确的签名"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "签名创建时间 %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "来自 \"%s\" 的错误签名"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "错误的签名"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "没有公钥来验证签名"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP验证不可用\n"
@@ -5830,258 +5788,258 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "正在创建摘要视图...\n"
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "处理标志"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "有一些剩余标记。处理吗？"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "没有未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "要复制的目标和当前文件夹相同。"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "正在选中全部邮件..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "正在取消线索以执行..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "邮件 %d 已缓存。\n"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "文件 %s 已经存在。\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "正在创建文本视图...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "不会接收到的邮件\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "要保存该部分，用右键单击以弹出环境菜单"
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "并选择 `另存为... '，"
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -6089,45 +6047,45 @@ msgstr ""
 "或按下 `y '键。\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "要以文本方式显示该部分，选择"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
 msgstr " `以文本显示 '，或按 `t '键。\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "要用外部程序打开该部分，选择"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr " `打开 '或 `打开用... '，"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "或双击、或单击中键，"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "或按下 `l '键。"
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "该签名还没有被检查。\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "要检查它，右键点击以弹出环境菜单\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "并选择 `检查签名 '。\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6160,6 +6118,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
 
+#~ msgid "OK"
+#~ msgstr "确定"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "No"
+#~ msgstr "否"
+
+#~ msgid "Refresh"
+#~ msgstr "刷新"
+
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Apply"
+#~ msgstr "应用"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "呀：签名没有验证"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "不同的签名结果"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "错误：未知的状态"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                也就是 `%s '\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "密钥指纹：%s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "找到的标签：%s\n"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index c9bed572..92a2e810 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: hiro-y@kcn.ne.jp\n"
-"POT-Creation-Date: 2005-01-18 19:53+0900\n"
+"POT-Creation-Date: 2005-01-31 15:22+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -49,22 +49,6 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/about.c:238 src/addressadd.c:242 src/alertpanel.c:286
-#: src/compose.c:4827 src/editaddress.c:199 src/editaddress.c:672
-#: src/editbook.c:221 src/editgroup.c:369 src/editjpilot.c:345
-#: src/editldap.c:244 src/editldap_basedn.c:214 src/editvcard.c:240
-#: src/export.c:198 src/foldersel.c:206 src/grouplistdialog.c:245
-#: src/import.c:203 src/inputdialog.c:204 src/main.c:448 src/main.c:456
-#: src/mainwindow.c:2605 src/messageview.c:621 src/mimeview.c:809
-#: src/passphrase.c:132 src/prefs.c:501 src/prefs_actions.c:162
-#: src/prefs_common.c:2481 src/prefs_common.c:2617 src/prefs_common.c:2910
-#: src/prefs_common.c:3040 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:191 src/prefs_filter_edit.c:330
-#: src/prefs_filter_edit.c:1555 src/prefs_summary_column.c:306
-#: src/prefs_template.c:261 src/sigstatus.c:135 src/summaryview.c:2734
-msgid "OK"
-msgstr "確定"
-
 #: src/account.c:121
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
@@ -98,11 +82,11 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account.c:638 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3839 src/editaddress.c:195 src/editaddress.c:934
-#: src/editaddress.c:982 src/editbook.c:191 src/editgroup.c:257
-#: src/editjpilot.c:296 src/editldap.c:299 src/editvcard.c:211
-#: src/mimeview.c:149 src/prefs_filter.c:213 src/prefs_folder_item.c:170
-#: src/select-keys.c:299
+#: src/compose.c:3833 src/editaddress.c:195 src/editaddress.c:936
+#: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
+#: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
+#: src/mimeview.c:149 src/prefs_filter.c:214 src/prefs_folder_item.c:170
+#: src/select-keys.c:319
 msgid "Name"
 msgstr "名稱"
 
@@ -114,30 +98,30 @@ msgstr "通訊協定"
 msgid "Server"
 msgstr "伺服器"
 
-#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:882
-#: src/editaddress.c:1015 src/prefs_actions.c:250 src/prefs_customheader.c:234
-#: src/prefs_display_header.c:268 src/prefs_display_header.c:323
-#: src/prefs_filter.c:274 src/prefs_filter_edit.c:1549
+#: src/account.c:669 src/addressbook.c:628 src/editaddress.c:884
+#: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
+#: src/prefs_display_header.c:269 src/prefs_display_header.c:324
+#: src/prefs_filter.c:275 src/prefs_filter_edit.c:1548
 msgid "Add"
 msgstr "新增"
 
-#: src/account.c:675 src/prefs_filter.c:280
+#: src/account.c:675 src/prefs_filter.c:281
 msgid "Edit"
 msgstr "編輯"
 
-#: src/account.c:681 src/prefs_customheader.c:240 src/prefs_filter.c:292
-#: src/prefs_filter_edit.c:1552
+#: src/account.c:681 src/prefs_customheader.c:241 src/prefs_filter.c:293
+#: src/prefs_filter_edit.c:1551
 msgid " Delete "
 msgstr "刪除"
 
-#: src/account.c:687 src/prefs_actions.c:311 src/prefs_customheader.c:286
-#: src/prefs_display_header.c:287 src/prefs_filter.c:250
+#: src/account.c:687 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/prefs_display_header.c:288 src/prefs_filter.c:251
 #: src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "向下"
 
-#: src/account.c:693 src/prefs_actions.c:305 src/prefs_customheader.c:280
-#: src/prefs_display_header.c:281 src/prefs_filter.c:244
+#: src/account.c:693 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/prefs_display_header.c:282 src/prefs_filter.c:245
 #: src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "向上"
@@ -146,13 +130,6 @@ msgstr "向上"
 msgid " Set as default account "
 msgstr "設為預設帳號"
 
-#: src/account.c:713 src/action.c:1106 src/addressbook.c:2400
-#: src/addressbook.c:2404 src/addressbook.c:2441 src/addressbook.c:2547
-#: src/addressbook.c:2553 src/inc.c:641 src/message_search.c:136
-#: src/prefs_filter.c:182 src/summary_search.c:224
-msgid "Close"
-msgstr "關閉"
-
 #: src/account.c:756
 msgid "Delete account"
 msgstr "刪除帳號"
@@ -161,24 +138,15 @@ msgstr "刪除帳號"
 msgid "Do you really want to delete this account?"
 msgstr "您確定要刪除這個帳號嗎？"
 
-#: src/account.c:758 src/addressbook.c:840 src/addressbook.c:1671
-#: src/compose.c:2522 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:707 src/folderview.c:1923 src/folderview.c:1972
-#: src/folderview.c:2005 src/folderview.c:2041 src/folderview.c:2163
-#: src/folderview.c:2199 src/main.c:698 src/mainwindow.c:1470
-#: src/mainwindow.c:1484 src/message_search.c:200 src/prefs_actions.c:559
-#: src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "Yes"
 msgstr "是的"
 
-#: src/account.c:758 src/compose.c:2775 src/compose.c:5007
-#: src/folderview.c:1923 src/folderview.c:2005 src/folderview.c:2041
-#: src/folderview.c:2163 src/folderview.c:2199
+#: src/account.c:758 src/compose.c:2770 src/compose.c:4997
+#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
+#: src/folderview.c:2156 src/folderview.c:2192
 msgid "+No"
 msgstr "+不要"
 
@@ -224,29 +192,29 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1015
+#: src/action.c:1016
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行指令中： %s\n"
 
-#: src/action.c:1019
+#: src/action.c:1020
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 結束指令： %s\n"
 
-#: src/action.c:1051
+#: src/action.c:1052
 msgid "Action's input/output"
 msgstr "執行指令之輸入/輸出"
 
-#: src/action.c:1094
+#: src/action.c:1095
 msgid " Send "
 msgstr "送出"
 
-#: src/action.c:1105
+#: src/action.c:1106
 msgid "Abort"
 msgstr "取消"
 
-#: src/action.c:1248
+#: src/action.c:1274
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -257,11 +225,11 @@ msgstr ""
 "（'%%h' 會被置換為該參數）\n"
 "  %s"
 
-#: src/action.c:1253
+#: src/action.c:1279
 msgid "Action's hidden user argument"
 msgstr "使用者設定隱藏之命令參數"
 
-#: src/action.c:1257
+#: src/action.c:1283
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -272,7 +240,7 @@ msgstr ""
 "（'%%u' 會被置換為該參數）\n"
 "  %s"
 
-#: src/action.c:1262
+#: src/action.c:1288
 msgid "Action's user argument"
 msgstr "使用者設定之命令參數"
 
@@ -280,13 +248,13 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將位址加入位址簿"
 
-#: src/addressadd.c:196 src/compose.c:4392 src/editaddress.c:196
-#: src/select-keys.c:300
+#: src/addressadd.c:196 src/compose.c:4381 src/editaddress.c:196
+#: src/select-keys.c:320
 msgid "Address"
 msgstr "位址"
 
 #: src/addressadd.c:206 src/addressbook.c:490 src/editaddress.c:197
-#: src/editaddress.c:787 src/editaddress.c:852 src/editgroup.c:259
+#: src/editaddress.c:789 src/editaddress.c:854 src/editgroup.c:259
 msgid "Remarks"
 msgstr "備註"
 
@@ -294,24 +262,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇位址簿資料夾"
 
-#: src/addressadd.c:243 src/addressbook.c:1665 src/compose.c:4828
-#: src/compose.c:5533 src/compose.c:5569 src/editaddress.c:200
-#: src/editaddress.c:673 src/editbook.c:222 src/editgroup.c:370
-#: src/editjpilot.c:346 src/editldap.c:245 src/editldap_basedn.c:215
-#: src/editvcard.c:241 src/export.c:199 src/foldersel.c:207
-#: src/grouplistdialog.c:246 src/import.c:204 src/importldif.c:762
-#: src/inputdialog.c:205 src/main.c:448 src/main.c:456 src/mainwindow.c:2605
-#: src/messageview.c:621 src/mimeview.c:809 src/passphrase.c:136
-#: src/prefs.c:502 src/prefs_actions.c:163 src/prefs_common.c:2482
-#: src/prefs_common.c:3041 src/prefs_customheader.c:158
-#: src/prefs_display_header.c:192 src/prefs_filter_edit.c:331
-#: src/prefs_filter_edit.c:1556 src/prefs_summary_column.c:307
-#: src/prefs_template.c:262 src/progressdialog.c:77 src/select-keys.c:323
-#: src/summaryview.c:598 src/summaryview.c:2734
-msgid "Cancel"
-msgstr "取消"
-
-#: src/addressbook.c:334 src/compose.c:459 src/mainwindow.c:453
+#: src/addressbook.c:334 src/compose.c:455 src/mainwindow.c:453
 #: src/messageview.c:130
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -332,8 +283,8 @@ msgstr "/檔案(_F)/新增J-Pilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:464
-#: src/compose.c:469 src/compose.c:473 src/mainwindow.c:470
+#: src/addressbook.c:343 src/addressbook.c:346 src/compose.c:460
+#: src/compose.c:465 src/compose.c:469 src/mainwindow.c:470
 #: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:478
 #: src/mainwindow.c:480 src/messageview.c:133
 msgid "/_File/---"
@@ -351,7 +302,7 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:348 src/compose.c:474 src/messageview.c:134
+#: src/addressbook.c:348 src/compose.c:470 src/messageview.c:134
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
@@ -383,7 +334,7 @@ msgstr "/位址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/位址(_A)/刪除(_D)"
 
-#: src/addressbook.c:356 src/compose.c:575 src/mainwindow.c:687
+#: src/addressbook.c:356 src/compose.c:571 src/mainwindow.c:687
 #: src/messageview.c:242
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -392,12 +343,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:732
+#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:732
 #: src/messageview.c:260
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:359 src/compose.c:589 src/mainwindow.c:743
+#: src/addressbook.c:359 src/compose.c:585 src/mainwindow.c:743
 #: src/messageview.c:261
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -414,7 +365,7 @@ msgstr "/新增群組(_G)"
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:453
+#: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:449
 #: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
 #: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
 #: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
@@ -424,7 +375,7 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:476
+#: src/addressbook.c:382 src/addressbook.c:392 src/compose.c:472
 #: src/mainwindow.c:484 src/messageview.c:136
 msgid "/_Edit"
 msgstr "/編輯(_E)"
@@ -437,18 +388,18 @@ msgstr "/刪除(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail位址"
 
-#: src/addressbook.c:493 src/compose.c:4393 src/prefs_common.c:2154
+#: src/addressbook.c:493 src/compose.c:4382 src/prefs_common.c:2144
 msgid "Address book"
 msgstr "位址簿"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:352
+#: src/addressbook.c:593 src/prefs_filter_edit.c:353
 msgid "Name:"
 msgstr "姓名："
 
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:876 src/editaddress.c:1009 src/mainwindow.c:2198
-#: src/prefs_actions.c:262 src/prefs_display_header.c:274
-#: src/prefs_display_header.c:329 src/prefs_template.c:227
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2201
+#: src/prefs_actions.c:263 src/prefs_display_header.c:275
+#: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
 msgstr "刪除"
 
@@ -477,18 +428,6 @@ msgstr "刪除位址紀錄"
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:840 src/addressbook.c:1671 src/compose.c:2522
-#: src/folderview.c:707 src/folderview.c:1972 src/main.c:698
-#: src/mainwindow.c:1470 src/mainwindow.c:1484 src/message_search.c:200
-#: src/prefs_actions.c:559 src/prefs_customheader.c:540 src/prefs_filter.c:700
-#: src/prefs_template.c:527 src/summary_search.c:329 src/summaryview.c:598
-#: src/summaryview.c:939 src/summaryview.c:963 src/summaryview.c:997
-#: src/summaryview.c:1021 src/summaryview.c:1055 src/summaryview.c:1080
-#: src/summaryview.c:1105 src/summaryview.c:1130 src/summaryview.c:2412
-#: src/textview.c:1626
-msgid "No"
-msgstr "不要"
-
 #: src/addressbook.c:1662
 #, c-format
 msgid ""
@@ -600,7 +539,7 @@ msgstr "轉換位址簿格式時發生錯誤"
 msgid "Addressbook Conversion"
 msgstr "位址簿格式轉換"
 
-#: src/addressbook.c:3053 src/prefs_common.c:867
+#: src/addressbook.c:3053 src/prefs_common.c:857
 msgid "Interface"
 msgstr "介面"
 
@@ -644,351 +583,351 @@ msgstr "共用位址紀錄"
 msgid "Personal address"
 msgstr "私人位址紀錄"
 
-#: src/alertpanel.c:123 src/compose.c:5007 src/main.c:446
+#: src/alertpanel.c:122 src/compose.c:4997 src/main.c:464
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:136 src/main.c:248 src/textview.c:1626
+#: src/alertpanel.c:135 src/main.c:261 src/textview.c:1644
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:149 src/compose.c:2775 src/inc.c:556
+#: src/alertpanel.c:148 src/compose.c:2770 src/inc.c:557
 msgid "Error"
 msgstr "錯誤"
 
-#: src/alertpanel.c:193
+#: src/alertpanel.c:191
 msgid "Creating alert panel dialog...\n"
 msgstr "產生警告對話框中... \n"
 
-#: src/alertpanel.c:270
+#: src/alertpanel.c:277
 msgid "Show this message next time"
 msgstr "下次再提醒我"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:45
 msgid "Orange"
 msgstr "橘色"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:46
 msgid "Red"
 msgstr "紅色"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:47
 msgid "Pink"
 msgstr "粉紅色"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:48
 msgid "Sky blue"
 msgstr "天藍色"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:49
 msgid "Blue"
 msgstr "藍色"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:50
 msgid "Green"
 msgstr "綠色"
 
-#: src/colorlabel.c:52
+#: src/colorlabel.c:51
 msgid "Brown"
 msgstr "棕色"
 
-#: src/colorlabel.c:284 src/prefs_folder_item.c:285 src/summaryview.c:3583
+#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3568
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:451
+#: src/compose.c:447
 msgid "/_Add..."
 msgstr "/新增...(_A)"
 
-#: src/compose.c:452
+#: src/compose.c:448
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:454 src/folderview.c:228 src/folderview.c:246
+#: src/compose.c:450 src/folderview.c:228 src/folderview.c:246
 #: src/folderview.c:261
 msgid "/_Properties..."
 msgstr "/內容...(_P)"
 
-#: src/compose.c:460
+#: src/compose.c:456
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:462
+#: src/compose.c:458
 msgid "/_File/Send _later"
 msgstr "/信件(_M)/待會傳送(_l)"
 
-#: src/compose.c:465
+#: src/compose.c:461
 msgid "/_File/Save to _draft folder"
 msgstr "/信件(_M)/儲存至草稿資料夾(_d)"
 
-#: src/compose.c:467
+#: src/compose.c:463
 msgid "/_File/Save and _keep editing"
 msgstr "/信件(_M)/儲存並繼續編輯(_k)"
 
-#: src/compose.c:470
+#: src/compose.c:466
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:471
+#: src/compose.c:467
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:472
+#: src/compose.c:468
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽名(_g)"
 
-#: src/compose.c:477
+#: src/compose.c:473
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:478
+#: src/compose.c:474
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:479 src/compose.c:557 src/mainwindow.c:488
+#: src/compose.c:475 src/compose.c:553 src/mainwindow.c:488
 #: src/messageview.c:139
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:480
+#: src/compose.c:476
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_t)"
 
-#: src/compose.c:481 src/mainwindow.c:485 src/messageview.c:137
+#: src/compose.c:477 src/mainwindow.c:485 src/messageview.c:137
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/compose.c:482
+#: src/compose.c:478
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/compose.c:483
+#: src/compose.c:479
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_q)"
 
-#: src/compose.c:485 src/mainwindow.c:486 src/messageview.c:138
+#: src/compose.c:481 src/mainwindow.c:486 src/messageview.c:138
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_a)"
 
-#: src/compose.c:486
+#: src/compose.c:482
 msgid "/_Edit/A_dvanced"
 msgstr "/編輯(_E)/進階(_d)"
 
-#: src/compose.c:487
+#: src/compose.c:483
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/編輯(_E)/進階(_d)/後移一字元"
 
-#: src/compose.c:492
+#: src/compose.c:488
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/編輯(_E)/進階(_d)/前移一字元"
 
-#: src/compose.c:497
+#: src/compose.c:493
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/編輯(_E)/進階(_d)/後移一字"
 
-#: src/compose.c:502
+#: src/compose.c:498
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/編輯(_E)/進階(_d)/前移一字"
 
-#: src/compose.c:507
+#: src/compose.c:503
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/編輯(_E)/進階(_d)/移到行開頭"
 
-#: src/compose.c:512
+#: src/compose.c:508
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/編輯(_E)/進階(_d)/移到行尾"
 
-#: src/compose.c:517
+#: src/compose.c:513
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/編輯(_E)/進階(_d)/移到前一行"
 
-#: src/compose.c:522
+#: src/compose.c:518
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/編輯(_E)/進階(_d)/移到下一行"
 
-#: src/compose.c:527
+#: src/compose.c:523
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/編輯(_E)/進階(_d)/往後刪除一字元"
 
-#: src/compose.c:532
+#: src/compose.c:528
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/編輯(_E)/進階(_d)/往前刪除一字元"
 
-#: src/compose.c:537
+#: src/compose.c:533
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/編輯(_E)/進階(_d)/往後刪除一字"
 
-#: src/compose.c:542
+#: src/compose.c:538
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/編輯(_E)/進階(_d)/往前刪除一字"
 
-#: src/compose.c:547
+#: src/compose.c:543
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/編輯(_E)/進階(_d)/刪除一行"
 
-#: src/compose.c:552
+#: src/compose.c:548
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/編輯(_E)/進階(_d)/從游標處起刪除至行尾"
 
-#: src/compose.c:558
+#: src/compose.c:554
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折行(_W)"
 
-#: src/compose.c:560
+#: src/compose.c:556
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的行折行(_l)"
 
-#: src/compose.c:562
+#: src/compose.c:558
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動換行(_o)"
 
-#: src/compose.c:563 src/mainwindow.c:493 src/messageview.c:143
+#: src/compose.c:559 src/mainwindow.c:493 src/messageview.c:143
 #: src/summaryview.c:370
 msgid "/_View"
 msgstr "/顯示(_V)"
 
-#: src/compose.c:564
+#: src/compose.c:560
 msgid "/_View/_To"
 msgstr "/顯示(_V)/收件人(_T)"
 
-#: src/compose.c:565
+#: src/compose.c:561
 msgid "/_View/_Cc"
 msgstr "/顯示(_V)/副本(_C)"
 
-#: src/compose.c:566
+#: src/compose.c:562
 msgid "/_View/_Bcc"
 msgstr "/顯示(_V)/密件副本(_s)"
 
-#: src/compose.c:567
+#: src/compose.c:563
 msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
-#: src/compose.c:568 src/compose.c:570 src/compose.c:572 src/mainwindow.c:511
+#: src/compose.c:564 src/compose.c:566 src/compose.c:568 src/mainwindow.c:511
 #: src/mainwindow.c:514 src/mainwindow.c:540 src/mainwindow.c:564
 #: src/mainwindow.c:640 src/mainwindow.c:644 src/messageview.c:219
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
-#: src/compose.c:569
+#: src/compose.c:565
 msgid "/_View/_Followup to"
 msgstr "/顯示(_V)/回應文章(_F)"
 
-#: src/compose.c:571
+#: src/compose.c:567
 msgid "/_View/R_uler"
 msgstr "/顯示(_V)/尺規(_u)"
 
-#: src/compose.c:573
+#: src/compose.c:569
 msgid "/_View/_Attachment"
 msgstr "/顯示(_V)/附加(_A)"
 
-#: src/compose.c:576 src/mainwindow.c:688 src/messageview.c:243
+#: src/compose.c:572 src/mainwindow.c:688 src/messageview.c:243
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/位址簿(_A)"
 
-#: src/compose.c:577
+#: src/compose.c:573
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用信件樣板(_T)"
 
-#: src/compose.c:578 src/mainwindow.c:706 src/messageview.c:258
+#: src/compose.c:574 src/mainwindow.c:706 src/messageview.c:258
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_n)"
 
-#: src/compose.c:579 src/compose.c:583 src/mainwindow.c:691
+#: src/compose.c:575 src/compose.c:579 src/mainwindow.c:691
 #: src/mainwindow.c:705 src/mainwindow.c:707 src/mainwindow.c:710
 #: src/mainwindow.c:712 src/messageview.c:246 src/messageview.c:257
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:580
+#: src/compose.c:576
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_x)"
 
-#: src/compose.c:584
+#: src/compose.c:580
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽章(_g)"
 
-#: src/compose.c:585
+#: src/compose.c:581
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:790
+#: src/compose.c:786
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:889 src/compose.c:944 src/procmsg.c:1301
+#: src/compose.c:885 src/compose.c:940 src/procmsg.c:1301
 msgid "Can't get text part\n"
 msgstr "沒有文字\n"
 
-#: src/compose.c:1305
+#: src/compose.c:1301
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1317
+#: src/compose.c:1313
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄信件格式錯誤。"
 
-#: src/compose.c:1632
+#: src/compose.c:1627
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在 \n"
 
-#: src/compose.c:1636
+#: src/compose.c:1631
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小 \n"
 
-#: src/compose.c:1640
+#: src/compose.c:1635
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:1644
+#: src/compose.c:1639
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:1679
+#: src/compose.c:1674
 #, c-format
 msgid "Message: %s"
 msgstr "信件：%s"
 
-#: src/compose.c:1750 src/mimeview.c:480
+#: src/compose.c:1745 src/mimeview.c:482
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2396
+#: src/compose.c:2391
 msgid " [Edited]"
 msgstr " [已修改]"
 
-#: src/compose.c:2398
+#: src/compose.c:2393
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新郵件%s"
 
-#: src/compose.c:2401
+#: src/compose.c:2396
 #, c-format
 msgid "Compose message%s"
 msgstr "新郵件%s"
 
-#: src/compose.c:2512
+#: src/compose.c:2507
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2520 src/compose.c:4313 src/mainwindow.c:2130
-#: src/prefs_account.c:702 src/prefs_common.c:853
+#: src/compose.c:2515 src/compose.c:4302 src/mainwindow.c:2133
+#: src/prefs_account.c:702 src/prefs_common.c:843
 msgid "Send"
 msgstr "送出"
 
-#: src/compose.c:2521
+#: src/compose.c:2516
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有標題。確定要送出？"
 
-#: src/compose.c:2572
+#: src/compose.c:2567
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2592
+#: src/compose.c:2587
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -996,26 +935,26 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2606 src/send_message.c:261
+#: src/compose.c:2601 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2629
+#: src/compose.c:2624
 msgid "Can't save the message to outbox."
 msgstr "無法將信件送至寄件夾中。"
 
-#: src/compose.c:2665
+#: src/compose.c:2660
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到所指定的 key id '%s'"
 
-#: src/compose.c:2725 src/compose.c:2940 src/compose.c:3004 src/compose.c:3123
+#: src/compose.c:2720 src/compose.c:2935 src/compose.c:2998 src/compose.c:3117
 #: src/utils.c:2174
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態 \n"
 
-#: src/compose.c:2771
+#: src/compose.c:2766
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
@@ -1025,138 +964,138 @@ msgstr ""
 "無法轉換將信件的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要傳送嗎？"
 
-#: src/compose.c:2811
+#: src/compose.c:2806
 msgid "can't write headers\n"
 msgstr "無法寫入標頭\n"
 
-#: src/compose.c:3083
+#: src/compose.c:3077
 msgid "can't remove the old message\n"
 msgstr "無法刪除原有的舊信件。\n"
 
-#: src/compose.c:3101
+#: src/compose.c:3095
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3183
+#: src/compose.c:3177
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾。\n"
 
-#: src/compose.c:3190
+#: src/compose.c:3184
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾。\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3730
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生信件的編號：%s\n"
 
-#: src/compose.c:3834
+#: src/compose.c:3828
 msgid "Creating compose window...\n"
 msgstr "產生新郵件...\n"
 
-#: src/compose.c:3837 src/compose.c:4799
+#: src/compose.c:3831 src/compose.c:4788
 msgid "MIME type"
 msgstr "MIME 型態"
 
-#: src/compose.c:3838 src/mimeview.c:148 src/prefs_filter_edit.c:568
-#: src/prefs_summary_column.c:73 src/select-keys.c:297 src/summaryview.c:386
+#: src/compose.c:3832 src/mimeview.c:148 src/prefs_filter_edit.c:569
+#: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:3889 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3883 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "來自："
 
-#: src/compose.c:4314
+#: src/compose.c:4303
 msgid "Send message"
 msgstr "送出信件"
 
-#: src/compose.c:4322
+#: src/compose.c:4311
 msgid "Send later"
 msgstr "待會再送出"
 
-#: src/compose.c:4323
+#: src/compose.c:4312
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中待會再送出"
 
-#: src/compose.c:4331
+#: src/compose.c:4320
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4332
+#: src/compose.c:4321
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/compose.c:4342 src/compose.c:5569
+#: src/compose.c:4331 src/compose.c:5559
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4343
+#: src/compose.c:4332
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/compose.c:4351
+#: src/compose.c:4340
 msgid "Attach"
 msgstr "附加"
 
-#: src/compose.c:4352
+#: src/compose.c:4341
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: src/compose.c:4362 src/prefs_account.c:1334 src/prefs_common.c:1260
+#: src/compose.c:4351 src/prefs_account.c:1334 src/prefs_common.c:1250
 msgid "Signature"
 msgstr "簽名"
 
-#: src/compose.c:4363
+#: src/compose.c:4352
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/compose.c:4372 src/prefs_common.c:1282 src/prefs_common.c:2133
+#: src/compose.c:4361 src/prefs_common.c:1272 src/prefs_common.c:2123
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/compose.c:4373
+#: src/compose.c:4362
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/compose.c:4381
+#: src/compose.c:4370
 msgid "Linewrap"
 msgstr "切割"
 
-#: src/compose.c:4382
+#: src/compose.c:4371
 msgid "Wrap all long lines"
 msgstr "切割所有過長的文字行"
 
-#: src/compose.c:4693
+#: src/compose.c:4682
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態"
 
-#: src/compose.c:4712
+#: src/compose.c:4701
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在, 或檔案是空的"
 
-#: src/compose.c:4781
+#: src/compose.c:4770
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:4801
+#: src/compose.c:4790
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:4824 src/prefs_folder_item.c:183
+#: src/compose.c:4813 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:4825
+#: src/compose.c:4814
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:4978
+#: src/compose.c:4968
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外用編輯器的命令是錯誤的：`%s'\n"
 
-#: src/compose.c:5004
+#: src/compose.c:4994
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1167,66 +1106,66 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:5017
+#: src/compose.c:5007
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "結束群組代碼為 %d 的行程"
 
-#: src/compose.c:5018
+#: src/compose.c:5008
 #, c-format
 msgid "Temporary file: %s"
 msgstr "暫存檔案：%s"
 
-#: src/compose.c:5042
+#: src/compose.c:5032
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
-#: src/compose.c:5075
+#: src/compose.c:5065
 msgid "Couldn't exec external editor\n"
 msgstr "無法執行外部編輯器。\n"
 
-#: src/compose.c:5079
+#: src/compose.c:5069
 msgid "Couldn't write to file\n"
 msgstr "無法寫入檔案。\n"
 
-#: src/compose.c:5081
+#: src/compose.c:5071
 msgid "Pipe read failed\n"
 msgstr "Pipe 讀取失敗。\n"
 
-#: src/compose.c:5383 src/compose.c:5391 src/compose.c:5397
+#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:5487 src/compose.c:5499
+#: src/compose.c:5477 src/compose.c:5489
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:5531
+#: src/compose.c:5521
 msgid "Discard message"
 msgstr "放棄信件"
 
-#: src/compose.c:5532
+#: src/compose.c:5522
 msgid "This message has been modified. discard it?"
 msgstr "信件已被修改過。要放棄它嗎？"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "Discard"
 msgstr "放棄"
 
-#: src/compose.c:5533
+#: src/compose.c:5523
 msgid "to Draft"
 msgstr "放入草稿資料夾"
 
-#: src/compose.c:5566
+#: src/compose.c:5556
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用 '%s' 這個信件樣板嗎？"
 
-#: src/compose.c:5568
+#: src/compose.c:5558
 msgid "Apply template"
 msgstr "套用信件樣板"
 
-#: src/compose.c:5569
+#: src/compose.c:5559
 msgid "Replace"
 msgstr "置換"
 
@@ -1234,77 +1173,76 @@ msgstr "置換"
 msgid "Edit address"
 msgstr "編輯位址紀錄"
 
-#: src/editaddress.c:320
+#: src/editaddress.c:321
 msgid "Add New Person"
 msgstr "新增人物位址紀錄"
 
-#: src/editaddress.c:321
+#: src/editaddress.c:322
 msgid "Edit Person Details"
 msgstr "編輯人物詳細資料"
 
-#: src/editaddress.c:462
+#: src/editaddress.c:463
 msgid "An E-Mail address must be supplied."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/editaddress.c:581
+#: src/editaddress.c:582
 msgid "A Name and Value must be supplied."
 msgstr "未輸入名稱與值"
 
-#: src/editaddress.c:639
+#: src/editaddress.c:640
 msgid "Edit Person Data"
 msgstr "編輯人物資料"
 
-#: src/editaddress.c:736
+#: src/editaddress.c:738
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/editaddress.c:742 src/editaddress.c:746
+#: src/editaddress.c:744 src/editaddress.c:748
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:743 src/editaddress.c:745
+#: src/editaddress.c:745 src/editaddress.c:747
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:748
+#: src/editaddress.c:750
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/editaddress.c:785 src/editaddress.c:834 src/editaddress.c:1043
+#: src/editaddress.c:787 src/editaddress.c:836 src/editaddress.c:1045
 #: src/editgroup.c:258
 msgid "E-Mail Address"
 msgstr "E-Mail位址"
 
-#: src/editaddress.c:786 src/editaddress.c:843
+#: src/editaddress.c:788 src/editaddress.c:845
 msgid "Alias"
 msgstr "別名"
 
-#: src/editaddress.c:870
+#: src/editaddress.c:872
 msgid "Move Up"
 msgstr "向上移"
 
-#: src/editaddress.c:873
+#: src/editaddress.c:875
 msgid "Move Down"
 msgstr "向下移"
 
-#: src/editaddress.c:879 src/editaddress.c:1012 src/importldif.c:635
+#: src/editaddress.c:881 src/editaddress.c:1014 src/importldif.c:635
 msgid "Modify"
 msgstr "變更"
 
-#: src/editaddress.c:885 src/editaddress.c:1018 src/message_search.c:135
-#: src/summary_search.c:223
+#: src/editaddress.c:887 src/editaddress.c:1020
 msgid "Clear"
 msgstr "清除"
 
-#: src/editaddress.c:935 src/editaddress.c:991 src/prefs_customheader.c:205
+#: src/editaddress.c:937 src/editaddress.c:993 src/prefs_customheader.c:206
 msgid "Value"
 msgstr "值"
 
-#: src/editaddress.c:1042
+#: src/editaddress.c:1044
 msgid "Basic Data"
 msgstr "基本資料"
 
-#: src/editaddress.c:1044
+#: src/editaddress.c:1046
 msgid "User Attributes"
 msgstr "人物屬性"
 
@@ -1320,7 +1258,7 @@ msgstr "這個檔案似乎並非合法格式之位址簿。"
 msgid "Could not read file."
 msgstr "無法讀取檔案。"
 
-#: src/editbook.c:169 src/editbook.c:279
+#: src/editbook.c:169 src/editbook.c:280
 msgid "Edit Addressbook"
 msgstr "編輯位址紀錄"
 
@@ -1333,7 +1271,7 @@ msgstr "檢查檔案(_C)"
 msgid "File"
 msgstr "/檔案(_F)"
 
-#: src/editbook.c:298
+#: src/editbook.c:299
 msgid "Add New Addressbook"
 msgstr "新增位址簿"
 
@@ -1365,32 +1303,32 @@ msgstr " ← "
 msgid "Available Addresses"
 msgstr "可使用之電子郵件地址"
 
-#: src/editgroup.c:406
+#: src/editgroup.c:407
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "請使用箭頭指標將電子郵件地址加入或移除該群組"
 
-#: src/editgroup.c:456
+#: src/editgroup.c:457
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:459
+#: src/editgroup.c:460
 msgid "Add New Group"
 msgstr "新增群組"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:509
+#: src/editgroup.c:510
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:512 src/foldersel.c:208 src/foldersel.c:412
-#: src/folderview.c:1779 src/folderview.c:1785
+#: src/editgroup.c:513 src/foldersel.c:412 src/folderview.c:1772
+#: src/folderview.c:1778
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:513 src/foldersel.c:413 src/folderview.c:1786
+#: src/editgroup.c:514 src/foldersel.c:413 src/folderview.c:1779
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -1402,11 +1340,11 @@ msgstr "檔案不是 JPilot 格式。"
 msgid "Select JPilot File"
 msgstr "選擇 JPilot 檔案"
 
-#: src/editjpilot.c:274 src/editjpilot.c:401
+#: src/editjpilot.c:274 src/editjpilot.c:402
 msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
-#: src/editjpilot.c:315 src/editldap.c:341 src/editvcard.c:230
+#: src/editjpilot.c:315 src/editldap.c:342 src/editvcard.c:230
 #: src/importldif.c:527 src/prefs_account.c:1846
 msgid " ... "
 msgstr "..."
@@ -1415,7 +1353,7 @@ msgstr "..."
 msgid "Additional e-Mail address item(s)"
 msgstr "額外的電子郵件地址"
 
-#: src/editjpilot.c:408
+#: src/editjpilot.c:409
 msgid "Add New JPilot Entry"
 msgstr "新增 JPilot 資料"
 
@@ -1423,63 +1361,63 @@ msgstr "新增 JPilot 資料"
 msgid "Connected successfully to server"
 msgstr "已連線到伺服器"
 
-#: src/editldap.c:168 src/editldap_basedn.c:292
+#: src/editldap.c:168 src/editldap_basedn.c:293
 msgid "Could not connect to server"
 msgstr "無法連線到伺服器"
 
-#: src/editldap.c:216 src/editldap.c:535
+#: src/editldap.c:216 src/editldap.c:536
 msgid "Edit LDAP Server"
 msgstr "編輯 LDAP 伺服器"
 
-#: src/editldap.c:308 src/editldap_basedn.c:163
+#: src/editldap.c:309 src/editldap_basedn.c:163
 msgid "Hostname"
 msgstr "機器名稱"
 
-#: src/editldap.c:317 src/editldap_basedn.c:173
+#: src/editldap.c:318 src/editldap_basedn.c:173
 msgid "Port"
 msgstr "連接埠"
 
-#: src/editldap.c:329
+#: src/editldap.c:330
 msgid " Check Server "
 msgstr "檢查伺服器(_C)"
 
-#: src/editldap.c:334 src/editldap_basedn.c:183
+#: src/editldap.c:335 src/editldap_basedn.c:183
 msgid "Search Base"
 msgstr ""
 
-#: src/editldap.c:391
+#: src/editldap.c:392
 msgid "Search Criteria"
 msgstr ""
 
-#: src/editldap.c:398
+#: src/editldap.c:399
 msgid " Reset "
 msgstr "重設(_R)"
 
-#: src/editldap.c:403
+#: src/editldap.c:404
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:412
+#: src/editldap.c:413
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:421
+#: src/editldap.c:422
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:435
+#: src/editldap.c:436
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:462 src/prefs_account.c:698
+#: src/editldap.c:463 src/prefs_account.c:698
 msgid "Basic"
 msgstr "基本設定"
 
-#: src/editldap.c:463
+#: src/editldap.c:464
 msgid "Extended"
 msgstr "延伸設定"
 
-#: src/editldap.c:547
+#: src/editldap.c:548
 msgid "Add New LDAP Server"
 msgstr "新增 LDAP 伺服器"
 
@@ -1491,7 +1429,7 @@ msgstr "編輯 LDAP 資料 - 選擇搜尋基點"
 msgid "Available Search Base(s)"
 msgstr "可用的搜尋基點"
 
-#: src/editldap_basedn.c:288
+#: src/editldap_basedn.c:289
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "無法從伺服器讀取搜尋基點，請您手動設定"
 
@@ -1503,11 +1441,11 @@ msgstr "檔案並非 vCard 格式"
 msgid "Select vCard File"
 msgstr "選擇 vCard 檔案"
 
-#: src/editvcard.c:189 src/editvcard.c:292
+#: src/editvcard.c:189 src/editvcard.c:293
 msgid "Edit vCard Entry"
 msgstr "編輯 vCard 資料"
 
-#: src/editvcard.c:297
+#: src/editvcard.c:298
 msgid "Add New vCard Entry"
 msgstr "新增 vCard 資料"
 
@@ -1536,10 +1474,10 @@ msgstr "選擇..."
 msgid "Select exporting file"
 msgstr "選擇匯出檔案："
 
-#: src/filter.c:827 src/prefs.c:159 src/prefs.c:187 src/prefs.c:232
+#: src/filter.c:827 src/prefs.c:157 src/prefs.c:185 src/prefs.c:230
 #: src/prefs_account.c:562 src/prefs_account.c:576
-#: src/prefs_customheader.c:381 src/prefs_customheader.c:427
-#: src/prefs_display_header.c:406 src/prefs_display_header.c:431
+#: src/prefs_customheader.c:382 src/prefs_customheader.c:428
+#: src/prefs_display_header.c:407 src/prefs_display_header.c:432
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
 
@@ -1547,41 +1485,41 @@ msgstr "寫入組態設定時失敗。\n"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:244 src/folderview.c:942 src/prefs_folder_item.c:212
+#: src/foldersel.c:244 src/folderview.c:935 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:247 src/folderview.c:949 src/prefs_folder_item.c:213
+#: src/foldersel.c:247 src/folderview.c:942 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:250 src/folderview.c:956 src/prefs_folder_item.c:215
+#: src/foldersel.c:250 src/folderview.c:949 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:253 src/folderview.c:963 src/prefs_folder_item.c:216
+#: src/foldersel.c:253 src/folderview.c:956 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:256 src/folderview.c:972 src/prefs_folder_item.c:214
+#: src/foldersel.c:256 src/folderview.c:965 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:414 src/folderview.c:1783 src/folderview.c:1787
+#: src/foldersel.c:414 src/folderview.c:1776 src/folderview.c:1780
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:422 src/folderview.c:1795 src/folderview.c:1849
+#: src/foldersel.c:422 src/folderview.c:1788 src/folderview.c:1842
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有 `%c' 這個字元。"
 
-#: src/foldersel.c:432 src/folderview.c:1805 src/folderview.c:1856
+#: src/foldersel.c:432 src/folderview.c:1798 src/folderview.c:1849
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾 `%s' 已存在。"
 
-#: src/foldersel.c:440 src/folderview.c:1812
+#: src/foldersel.c:440 src/folderview.c:1805
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
@@ -1642,64 +1580,64 @@ msgstr "未讀的"
 msgid "#"
 msgstr ""
 
-#: src/folderview.c:439
+#: src/folderview.c:432
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:440
+#: src/folderview.c:433
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:659 src/mainwindow.c:3155 src/setup.c:81
+#: src/folderview.c:652 src/mainwindow.c:3159 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:663 src/mainwindow.c:3160 src/setup.c:86
+#: src/folderview.c:656 src/mainwindow.c:3164 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:705
+#: src/folderview.c:698
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:706
+#: src/folderview.c:699
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:715
+#: src/folderview.c:708
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:721
+#: src/folderview.c:714
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:739
+#: src/folderview.c:732
 msgid "Rebuilding all folder trees..."
 msgstr "重建所有資料夾結構中..."
 
-#: src/folderview.c:816
+#: src/folderview.c:809
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1598
+#: src/folderview.c:1591
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1693
+#: src/folderview.c:1686
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載信件中..."
 
-#: src/folderview.c:1729
+#: src/folderview.c:1722
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載信件時出現錯誤。"
 
-#: src/folderview.c:1780
+#: src/folderview.c:1773
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1709,16 +1647,16 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上 `/'）"
 
-#: src/folderview.c:1840
+#: src/folderview.c:1833
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入 `%s' 的新名稱："
 
-#: src/folderview.c:1841
+#: src/folderview.c:1834
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:1920
+#: src/folderview.c:1913
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1727,24 +1665,24 @@ msgstr ""
 "所有在 `%s' 資料夾下面的信件與子資料夾都將會被刪除。\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:1922
+#: src/folderview.c:1915
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:1938
+#: src/folderview.c:1931
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "無法刪除資料夾 `%s'。"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:1971
+#: src/folderview.c:1964
 msgid "Empty all messages in trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2002
+#: src/folderview.c:1995
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1753,34 +1691,34 @@ msgstr ""
 "確定要刪除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2004
+#: src/folderview.c:1997
 msgid "Remove mailbox"
 msgstr "/刪除信箱"
 
-#: src/folderview.c:2039
+#: src/folderview.c:2032
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2040
+#: src/folderview.c:2033
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2154
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組 `%s' 嗎？"
 
-#: src/folderview.c:2162
+#: src/folderview.c:2155
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2197
+#: src/folderview.c:2190
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號 `%s' 嗎？"
 
-#: src/folderview.c:2198
+#: src/folderview.c:2191
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -1812,10 +1750,6 @@ msgstr "信件"
 msgid "Type"
 msgstr "MIME 型態"
 
-#: src/grouplistdialog.c:247
-msgid "Refresh"
-msgstr "刷新"
-
 #: src/grouplistdialog.c:351
 msgid "moderated"
 msgstr "管理"
@@ -1828,15 +1762,15 @@ msgstr "唯讀"
 msgid "unknown"
 msgstr "未知的"
 
-#: src/grouplistdialog.c:402
+#: src/grouplistdialog.c:404
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/grouplistdialog.c:443 src/summaryview.c:717
+#: src/grouplistdialog.c:449 src/summaryview.c:700
 msgid "Done."
 msgstr "完成"
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:483
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 個新聞群組 (%s 已讀)"
@@ -1853,11 +1787,11 @@ msgstr "標題："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:177 src/summaryview.c:1893
+#: src/headerview.c:174 src/summaryview.c:1878
 msgid "(No From)"
 msgstr "（沒有來源）"
 
-#: src/headerview.c:192 src/summaryview.c:1916
+#: src/headerview.c:189 src/summaryview.c:1901
 msgid "(No Subject)"
 msgstr "（沒有標題）"
 
@@ -2090,7 +2024,7 @@ msgstr "屬性名"
 msgid "Attribute"
 msgstr "屬性"
 
-#: src/importldif.c:628 src/select-keys.c:322
+#: src/importldif.c:628 src/select-keys.c:342
 msgid "Select"
 msgstr "選擇"
 
@@ -2114,7 +2048,7 @@ msgstr "將 LDIF 檔匯入位址簿"
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importldif.c:761 src/mainwindow.c:2216
+#: src/importldif.c:761 src/mainwindow.c:2219
 msgid "Next"
 msgstr "下一封"
 
@@ -2130,133 +2064,133 @@ msgstr "屬性"
 msgid "Finish"
 msgstr "完成"
 
-#: src/inc.c:337
+#: src/inc.c:338
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:384
+#: src/inc.c:385
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:511 src/inc.c:562
+#: src/inc.c:512 src/inc.c:563
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:522
+#: src/inc.c:523
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:531
+#: src/inc.c:532
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:535
+#: src/inc.c:536
 msgid "Done (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:541
+#: src/inc.c:542
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:545
+#: src/inc.c:546
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:549
+#: src/inc.c:550
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:559
+#: src/inc.c:560
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:609
+#: src/inc.c:610
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:612
+#: src/inc.c:613
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:621
+#: src/inc.c:622
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:657
+#: src/inc.c:658
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:660
+#: src/inc.c:661
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:679
+#: src/inc.c:680
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:688
+#: src/inc.c:689
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:767 src/send_message.c:460
+#: src/inc.c:768 src/send_message.c:460
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:768
+#: src/inc.c:769
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:773
+#: src/inc.c:774
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:777
+#: src/inc.c:778
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:781
+#: src/inc.c:782
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:785
+#: src/inc.c:786
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:795
+#: src/inc.c:796
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:802 src/send_message.c:478
+#: src/inc.c:803 src/send_message.c:478
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:827
+#: src/inc.c:828
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:848
+#: src/inc.c:849
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1075
+#: src/inc.c:1076
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1081
+#: src/inc.c:1082
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1086
+#: src/inc.c:1087
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2265,38 +2199,38 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1092
+#: src/inc.c:1093
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1097
+#: src/inc.c:1098
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1102
+#: src/inc.c:1103
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
-#: src/inc.c:1108 src/send_message.c:600
+#: src/inc.c:1109 src/send_message.c:600
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1114
+#: src/inc.c:1115
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次抓取未完成。"
 
-#: src/inc.c:1118
+#: src/inc.c:1119
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1124 src/send_message.c:585
+#: src/inc.c:1125 src/send_message.c:585
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1129 src/send_message.c:588
+#: src/inc.c:1130 src/send_message.c:588
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2305,15 +2239,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1134 src/send_message.c:604
+#: src/inc.c:1135 src/send_message.c:604
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1170
+#: src/inc.c:1171
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1253
+#: src/inc.c:1254
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -2331,7 +2265,7 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:126 src/main.c:135 src/mh.c:792
+#: src/main.c:128 src/main.c:137 src/mh.c:792
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -2340,11 +2274,11 @@ msgstr ""
 "檔案 `%s' 已存在。\n"
 "無法產生資料夾。"
 
-#: src/main.c:181
+#: src/main.c:183
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支援 g_thread。\n"
 
-#: src/main.c:249
+#: src/main.c:262
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2352,16 +2286,16 @@ msgstr ""
 "GnuPG 並未安裝好，或版本過舊。\n"
 "關閉 OpenPGP 支援項目。"
 
-#: src/main.c:402
+#: src/main.c:420
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:405
+#: src/main.c:423
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    直接開啟撰寫郵件視窗"
 
-#: src/main.c:406
+#: src/main.c:424
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2370,62 +2304,62 @@ msgstr ""
 "  --attach file1 [file2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:409
+#: src/main.c:427
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:410
+#: src/main.c:428
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:411
+#: src/main.c:429
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的信件"
 
-#: src/main.c:412
+#: src/main.c:430
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   顯示資料夾內總共有多少信件"
 
-#: src/main.c:413
+#: src/main.c:431
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [folder]...     顯示每個資料夾中有多少信件"
 
-#: src/main.c:415
+#: src/main.c:433
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:416
+#: src/main.c:434
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:417
+#: src/main.c:435
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:447
+#: src/main.c:465
 msgid "Composing message exists. Really quit?"
 msgstr "有信件正在編輯。確定要離開嗎？"
 
-#: src/main.c:454
+#: src/main.c:473
 msgid "Queued messages"
 msgstr "有未送出信件"
 
-#: src/main.c:455
+#: src/main.c:474
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些信件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:529
+#: src/main.c:551
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:695
+#: src/main.c:717
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "外部指令設定"
 
-#: src/main.c:696
+#: src/main.c:718
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3058,56 +2992,56 @@ msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_E)"
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "Creating main window...\n"
 msgstr "產生主視窗...\n"
 
-#: src/mainwindow.c:941
+#: src/mainwindow.c:942
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1015 src/summaryview.c:1383 src/summaryview.c:1692
-#: src/summaryview.c:1800 src/summaryview.c:1846 src/summaryview.c:2465
-#: src/summaryview.c:3093 src/summaryview.c:3159 src/summaryview.c:3184
-#: src/summaryview.c:3297
+#: src/mainwindow.c:1020 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2450
+#: src/summaryview.c:3078 src/summaryview.c:3144 src/summaryview.c:3169
+#: src/summaryview.c:3282
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1131 src/mainwindow.c:1172 src/mainwindow.c:1200
+#: src/mainwindow.c:1136 src/mainwindow.c:1177 src/mainwindow.c:1205
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1201
+#: src/mainwindow.c:1206
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1251
+#: src/mainwindow.c:1256
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1468
+#: src/mainwindow.c:1473
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1469
+#: src/mainwindow.c:1474
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1488
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1483
+#: src/mainwindow.c:1489
 msgid "Empty messages in all trash?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1510
+#: src/mainwindow.c:1517
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1511
+#: src/mainwindow.c:1518
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3117,16 +3051,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱。\n"
 "系統將會自動判別是否信箱已存在。"
 
-#: src/mainwindow.c:1517
+#: src/mainwindow.c:1524
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱 %s 已存在。"
 
-#: src/mainwindow.c:1522 src/setup.c:57
+#: src/mainwindow.c:1529 src/setup.c:57
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1528 src/setup.c:63
+#: src/mainwindow.c:1535 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3135,141 +3069,141 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:1891
+#: src/mainwindow.c:1898
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾列表"
 
-#: src/mainwindow.c:1911 src/messageview.c:329
+#: src/mainwindow.c:1918 src/messageview.c:329
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 信件列表"
 
-#: src/mainwindow.c:2061 src/summaryview.c:340
+#: src/mainwindow.c:2068 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2062
+#: src/mainwindow.c:2069
 msgid "/Reply to _all"
 msgstr "/全部回覆(_a)"
 
-#: src/mainwindow.c:2063
+#: src/mainwindow.c:2070
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_s)"
 
-#: src/mainwindow.c:2064
+#: src/mainwindow.c:2071
 msgid "/Reply to mailing _list"
 msgstr "/回覆到 Mailing list(_l)"
 
-#: src/mainwindow.c:2069 src/summaryview.c:347
+#: src/mainwindow.c:2076 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2070 src/summaryview.c:348
+#: src/mainwindow.c:2077 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/將信件當成附加檔轉寄(_w)"
 
-#: src/mainwindow.c:2071 src/summaryview.c:349
+#: src/mainwindow.c:2078 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/信件導向(_t)"
 
-#: src/mainwindow.c:2111
+#: src/mainwindow.c:2114
 msgid "Get"
 msgstr "檢查郵件"
 
-#: src/mainwindow.c:2112
+#: src/mainwindow.c:2115
 msgid "Incorporate new mail"
 msgstr "檢查目前帳號的新郵件"
 
-#: src/mainwindow.c:2119
+#: src/mainwindow.c:2122
 msgid "Get all"
 msgstr "全部檢查"
 
-#: src/mainwindow.c:2120
+#: src/mainwindow.c:2123
 msgid "Incorporate new mail of all accounts"
 msgstr "檢查所有帳號的新郵件"
 
-#: src/mainwindow.c:2131
+#: src/mainwindow.c:2134
 msgid "Send queued message(s)"
 msgstr "將暫存資料夾中的信件送出"
 
-#: src/mainwindow.c:2141 src/prefs_account.c:704 src/prefs_common.c:855
+#: src/mainwindow.c:2144 src/prefs_account.c:704 src/prefs_common.c:845
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2145
 msgid "Compose new message"
 msgstr "編輯新郵件"
 
-#: src/mainwindow.c:2150 src/prefs_common.c:1352
+#: src/mainwindow.c:2153 src/prefs_common.c:1342
 msgid "Reply"
 msgstr "回覆"
 
-#: src/mainwindow.c:2151 src/mainwindow.c:2164
+#: src/mainwindow.c:2154 src/mainwindow.c:2167
 msgid "Reply to the message"
 msgstr "回覆信件"
 
-#: src/mainwindow.c:2169
+#: src/mainwindow.c:2172
 msgid "Reply all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2170
+#: src/mainwindow.c:2173
 msgid "Reply to all"
 msgstr "全部回覆"
 
-#: src/mainwindow.c:2178 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2181 src/prefs_filter_edit.c:719
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/mainwindow.c:2179 src/mainwindow.c:2192
+#: src/mainwindow.c:2182 src/mainwindow.c:2195
 msgid "Forward the message"
 msgstr "轉寄信件"
 
-#: src/mainwindow.c:2199
+#: src/mainwindow.c:2202
 msgid "Delete the message"
 msgstr "刪除信件"
 
-#: src/mainwindow.c:2207
+#: src/mainwindow.c:2210
 msgid "Execute"
 msgstr "執行"
 
-#: src/mainwindow.c:2208
+#: src/mainwindow.c:2211
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2220
 msgid "Next unread message"
 msgstr "下一封未讀郵件"
 
-#: src/mainwindow.c:2228
+#: src/mainwindow.c:2231
 msgid "Prefs"
 msgstr "設定"
 
-#: src/mainwindow.c:2229
+#: src/mainwindow.c:2232
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2236 src/prefs_folder_item.c:258
-#: src/prefs_folder_item.c:269 src/progressdialog.c:52
+#: src/mainwindow.c:2239 src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:269 src/progressdialog.c:53
 msgid "Account"
 msgstr "帳號"
 
-#: src/mainwindow.c:2237
+#: src/mainwindow.c:2240
 msgid "Account setting"
 msgstr "帳號設定"
 
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2414
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2422
+#: src/mainwindow.c:2425
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:2604
+#: src/mainwindow.c:2607
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
@@ -3371,10 +3305,6 @@ msgstr "區分大小寫"
 msgid "Backward search"
 msgstr "往回尋找"
 
-#: src/message_search.c:134 src/summary_search.c:222
-msgid "Search"
-msgstr "尋找"
-
 #: src/message_search.c:184 src/summary_search.c:317
 msgid "Search failed"
 msgstr "搜尋失敗"
@@ -3399,28 +3329,28 @@ msgstr "搜尋結束"
 msgid "Creating message view...\n"
 msgstr "產生信件視窗...\n"
 
-#: src/messageview.c:614 src/mimeview.c:802 src/summaryview.c:2727
+#: src/messageview.c:616 src/mimeview.c:804 src/summaryview.c:2712
 msgid "Save as"
 msgstr "另存新檔"
 
-#: src/messageview.c:619 src/mimeview.c:807 src/summaryview.c:2732
+#: src/messageview.c:621 src/mimeview.c:809 src/summaryview.c:2717
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: src/messageview.c:620 src/mimeview.c:808 src/summaryview.c:2733
+#: src/messageview.c:622 src/mimeview.c:810 src/summaryview.c:2718
 msgid "Overwrite existing file?"
 msgstr "您要取代已存在的檔案嗎？"
 
-#: src/messageview.c:627 src/summaryview.c:2740
+#: src/messageview.c:629 src/summaryview.c:2725
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案 `%s'。"
 
-#: src/messageview.c:669 src/prefs_common.c:2122 src/summaryview.c:2757
+#: src/messageview.c:671 src/prefs_common.c:2112 src/summaryview.c:2742
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:670 src/summaryview.c:2758
+#: src/messageview.c:672 src/summaryview.c:2743
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3429,7 +3359,7 @@ msgstr ""
 "請輸入列印指令：\n"
 "（ `%s' 將會被置換為檔名）"
 
-#: src/messageview.c:676 src/summaryview.c:2764
+#: src/messageview.c:678 src/summaryview.c:2749
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3489,7 +3419,7 @@ msgstr "產生 MIME 視窗...\n"
 msgid "MIME Type"
 msgstr "MIME 型態"
 
-#: src/mimeview.c:157 src/prefs_common.c:1543
+#: src/mimeview.c:157 src/prefs_common.c:1533
 msgid "Text"
 msgstr "文字"
 
@@ -3501,15 +3431,15 @@ msgstr "附加檔"
 msgid "Select \"Check signature\" to check"
 msgstr "請選擇「檢查數位簽章」來檢查"
 
-#: src/mimeview.c:762 src/mimeview.c:815 src/mimeview.c:833 src/mimeview.c:856
+#: src/mimeview.c:764 src/mimeview.c:817 src/mimeview.c:835 src/mimeview.c:858
 msgid "Can't save the part of multipart message."
 msgstr "無法儲存這個附加檔。"
 
-#: src/mimeview.c:866
+#: src/mimeview.c:868
 msgid "Open with"
 msgstr "以別的程式開啟"
 
-#: src/mimeview.c:867
+#: src/mimeview.c:869
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3518,7 +3448,7 @@ msgstr ""
 "請輸入開啟指令：\n"
 "（ `%s' 將會被置換為檔名）"
 
-#: src/mimeview.c:922
+#: src/mimeview.c:924
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "開啟此 MIME 型態的命令是錯誤的：`%s'"
@@ -3623,15 +3553,15 @@ msgstr "發表文章時發生錯誤\n"
 msgid "Error occurred while sending command\n"
 msgstr "送出命令時發生錯誤。\n"
 
-#: src/passphrase.c:87
+#: src/passphrase.c:86
 msgid "Passphrase"
 msgstr "密碼片語"
 
-#: src/passphrase.c:268
+#: src/passphrase.c:236
 msgid "[no user id]"
 msgstr "[找不到使用者]"
 
-#: src/passphrase.c:272
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3640,7 +3570,7 @@ msgid ""
 "(%.*s)\n"
 msgstr "%s請輸入 %.*s (%.*s) 的密碼片語:\n"
 
-#: src/passphrase.c:276
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -3648,70 +3578,66 @@ msgstr ""
 "無效的密碼片語! 請再試一次...\n"
 "\n"
 
-#: src/pop.c:147
+#: src/pop.c:149
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在通訊中找不到 APOP 的 timestamp。\n"
 
-#: src/pop.c:154
+#: src/pop.c:156
 msgid "Timestamp syntax error in greeting\n"
 msgstr "通訊中的 timestamp 語法錯誤\n"
 
-#: src/pop.c:180 src/pop.c:207
+#: src/pop.c:182 src/pop.c:209
 msgid "POP3 protocol error\n"
 msgstr "POP3 協定有錯誤\n"
 
-#: src/pop.c:252
+#: src/pop.c:254
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "UIDL 回應錯誤：%s\n"
 
-#: src/pop.c:621
+#: src/pop.c:616
 #, c-format
 msgid "POP3: Deleting expired message %d\n"
 msgstr "POP3: 刪除過期的信件 %d\n"
 
-#: src/pop.c:629
+#: src/pop.c:624
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d (%d bytes)\n"
 
-#: src/pop.c:660
+#: src/pop.c:655
 msgid "mailbox is locked\n"
 msgstr "信箱已被鎖定，可能前一次抓取未完成。\n"
 
-#: src/pop.c:663
+#: src/pop.c:658
 msgid "session timeout\n"
 msgstr "作業逾時\n"
 
-#: src/pop.c:669 src/smtp.c:510
+#: src/pop.c:664 src/smtp.c:510
 msgid "can't start TLS session\n"
 msgstr "無法啟動 TLS\n"
 
-#: src/pop.c:676 src/smtp.c:445
+#: src/pop.c:671 src/smtp.c:445
 msgid "error occurred on authentication\n"
 msgstr "認證時發生錯誤\n"
 
-#: src/pop.c:681
+#: src/pop.c:676
 msgid "command not supported\n"
 msgstr "命令未支援\n"
 
-#: src/pop.c:685
+#: src/pop.c:680
 msgid "error occurred on POP3 session\n"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/prefs.c:202
+#: src/prefs.c:200
 #, c-format
 msgid "Found %s\n"
 msgstr "找到 %s\n"
 
-#: src/prefs.c:235
+#: src/prefs.c:233
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
-#: src/prefs.c:503
-msgid "Apply"
-msgstr "套用"
-
 #: src/prefs_account.c:607
 msgid "Opening account preferences window...\n"
 msgstr "開啟帳號設定的視窗...\n"
@@ -3733,11 +3659,11 @@ msgstr "帳號設定"
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗...\n"
 
-#: src/prefs_account.c:700 src/prefs_common.c:851
+#: src/prefs_account.c:700 src/prefs_common.c:841
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account.c:707 src/prefs_common.c:864
+#: src/prefs_account.c:707 src/prefs_common.c:854
 msgid "Privacy"
 msgstr "私人資料"
 
@@ -3846,7 +3772,7 @@ msgstr "接收伺服器上所有的郵件。"
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1057 src/prefs_filter_edit.c:621
+#: src/prefs_account.c:1057 src/prefs_filter_edit.c:622
 msgid "KB"
 msgstr ""
 
@@ -3866,7 +3792,7 @@ msgstr "（未經過濾的信件將會被送到這個資料夾上）"
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1190
+#: src/prefs_account.c:1121 src/prefs_account.c:1237 src/prefs_common.c:1180
 msgid "Automatic"
 msgstr "自動"
 
@@ -3874,7 +3800,7 @@ msgstr "自動"
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全部檢查」時檢查這個帳號的新郵件"
 
-#: src/prefs_account.c:1177 src/prefs_customheader.c:188
+#: src/prefs_account.c:1177 src/prefs_customheader.c:189
 msgid "Header"
 msgstr "信件標頭設定"
 
@@ -3890,7 +3816,7 @@ msgstr "產生郵件識別碼"
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account.c:1194 src/prefs_common.c:1704 src/prefs_common.c:1729
+#: src/prefs_account.c:1194 src/prefs_common.c:1694 src/prefs_common.c:1719
 msgid " Edit... "
 msgstr "編輯..."
 
@@ -4082,19 +4008,19 @@ msgstr ""
 "注意：不建議您使用舊式的 ASCII-armored 模式來加密。因為\n"
 "它與 RFC 3156 - MIME Security with OpenPGP 不相容。"
 
-#: src/prefs_actions.c:168
+#: src/prefs_actions.c:169
 msgid "Actions configuration"
 msgstr "外部指令設定"
 
-#: src/prefs_actions.c:190
+#: src/prefs_actions.c:191
 msgid "Menu name:"
 msgstr "命令目錄名稱："
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:200
 msgid "Command line:"
 msgstr "執行指令："
 
-#: src/prefs_actions.c:211
+#: src/prefs_actions.c:212
 msgid ""
 "Menu name:\n"
 " Use / in menu name to make submenus.\n"
@@ -4129,43 +4055,43 @@ msgstr ""
 "用 %h 來表示使用者提供之隱藏參數。\n"
 "用 %s 來表示文字選擇。"
 
-#: src/prefs_actions.c:256
+#: src/prefs_actions.c:257
 msgid " Replace "
 msgstr "置換"
 
-#: src/prefs_actions.c:268
+#: src/prefs_actions.c:269
 msgid " Syntax help "
 msgstr "語法說明"
 
-#: src/prefs_actions.c:287
+#: src/prefs_actions.c:288
 msgid "Registered actions"
 msgstr "已加入之指令目錄"
 
-#: src/prefs_actions.c:416 src/prefs_template.c:306
+#: src/prefs_actions.c:417 src/prefs_template.c:306
 msgid "(New)"
 msgstr "（新）"
 
-#: src/prefs_actions.c:462
+#: src/prefs_actions.c:463
 msgid "Menu name is not set."
 msgstr "指令目錄名稱未設定"
 
-#: src/prefs_actions.c:467
+#: src/prefs_actions.c:468
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "冒號 ':' 不能出現在目錄名稱內。"
 
-#: src/prefs_actions.c:477
+#: src/prefs_actions.c:478
 msgid "Menu name is too long."
 msgstr "目錄名稱太長。"
 
-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:487
 msgid "Command line not set."
 msgstr "未設定執行指令"
 
-#: src/prefs_actions.c:491
+#: src/prefs_actions.c:492
 msgid "Menu name and command are too long."
 msgstr "目錄名稱與執行指令過長。"
 
-#: src/prefs_actions.c:496
+#: src/prefs_actions.c:497
 #, c-format
 msgid ""
 "The command\n"
@@ -4176,91 +4102,91 @@ msgstr ""
 "%s\n"
 "的語法錯誤。"
 
-#: src/prefs_actions.c:557
+#: src/prefs_actions.c:558
 msgid "Delete action"
 msgstr "刪除指令"
 
-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:559
 msgid "Do you really want to delete this action?"
 msgstr "您確定要刪除這個指令嗎？"
 
-#: src/prefs_common.c:831
+#: src/prefs_common.c:821
 msgid "Creating common preferences window...\n"
 msgstr "產生一般設定視窗...\n"
 
-#: src/prefs_common.c:835
+#: src/prefs_common.c:825
 msgid "Common Preferences"
 msgstr "一般設定"
 
-#: src/prefs_common.c:857
+#: src/prefs_common.c:847
 msgid "Quote"
 msgstr "引言"
 
-#: src/prefs_common.c:859
+#: src/prefs_common.c:849
 msgid "Display"
 msgstr "顯示"
 
-#: src/prefs_common.c:861
+#: src/prefs_common.c:851
 msgid "Message"
 msgstr "信件"
 
-#: src/prefs_common.c:869 src/select-keys.c:324
+#: src/prefs_common.c:859 src/select-keys.c:344
 msgid "Other"
 msgstr "其他"
 
-#: src/prefs_common.c:910 src/prefs_common.c:1076
+#: src/prefs_common.c:900 src/prefs_common.c:1066
 msgid "External program"
 msgstr "外部程式"
 
-#: src/prefs_common.c:919
+#: src/prefs_common.c:909
 msgid "Use external program for incorporation"
 msgstr "用其他外部程式來收信"
 
-#: src/prefs_common.c:926 src/prefs_common.c:1091
+#: src/prefs_common.c:916 src/prefs_common.c:1081
 msgid "Command"
 msgstr "命令列"
 
-#: src/prefs_common.c:940
+#: src/prefs_common.c:930
 msgid "Local spool"
 msgstr "本地 spool"
 
-#: src/prefs_common.c:951
+#: src/prefs_common.c:941
 msgid "Incorporate from spool"
 msgstr "從 spool 取得信件"
 
-#: src/prefs_common.c:953
+#: src/prefs_common.c:943
 msgid "Filter on incorporation"
 msgstr "收信時過濾"
 
-#: src/prefs_common.c:961
+#: src/prefs_common.c:951
 msgid "Spool path"
 msgstr "Spool 路徑"
 
-#: src/prefs_common.c:979
+#: src/prefs_common.c:969
 msgid "Auto-check new mail"
 msgstr "自動檢查新郵件"
 
-#: src/prefs_common.c:981
+#: src/prefs_common.c:971
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common.c:993
+#: src/prefs_common.c:983
 msgid "minute(s)"
 msgstr "分鐘"
 
-#: src/prefs_common.c:1002
+#: src/prefs_common.c:992
 msgid "Check new mail on startup"
 msgstr "開啟時檢查新郵件"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:994
 msgid "Update all local folders after incorporation"
 msgstr "收信後更新所有資料夾"
 
-#: src/prefs_common.c:1006
+#: src/prefs_common.c:996
 msgid "News"
 msgstr "新聞"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1004
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4268,115 +4194,115 @@ msgstr ""
 "一次下載文章數量上限\n"
 "(設為 0 則不限制數量)"
 
-#: src/prefs_common.c:1084
+#: src/prefs_common.c:1074
 msgid "Use external program for sending"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1100
 msgid "Save sent messages to outbox"
 msgstr "將已送出之信件存到寄件夾"
 
-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1106
 msgid "Outgoing codeset"
 msgstr "輸出字集"
 
-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1121
 msgid "Automatic (Recommended)"
 msgstr "自動選擇（推薦使用）"
 
-#: src/prefs_common.c:1132
+#: src/prefs_common.c:1122
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位元 ASCII 字集"
 
-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1123
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_common.c:1134
+#: src/prefs_common.c:1124
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: src/prefs_common.c:1135
+#: src/prefs_common.c:1125
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common.c:1136
+#: src/prefs_common.c:1126
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: src/prefs_common.c:1137
+#: src/prefs_common.c:1127
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1128
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common.c:1139
+#: src/prefs_common.c:1129
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1130
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common.c:1141
+#: src/prefs_common.c:1131
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1132
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1133
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1134
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1135
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1147
+#: src/prefs_common.c:1137
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1138
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1140
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common.c:1151
+#: src/prefs_common.c:1141
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common.c:1153
+#: src/prefs_common.c:1143
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1144
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1146
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common.c:1157
+#: src/prefs_common.c:1147
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1158
+#: src/prefs_common.c:1148
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1158
 msgid ""
 "If `Automatic' is selected, the optimal encoding\n"
 "for the current locale will be used."
@@ -4384,436 +4310,436 @@ msgstr ""
 "若是選用「自動選擇」，系統將為自動為您判斷使用最\n"
 "合用的語系設定。"
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1170
 msgid "Transfer encoding"
 msgstr "傳送之編碼"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1193
 msgid ""
 "Specify Content-Transfer-Encoding used when\n"
 "message body contains non-ASCII characters."
 msgstr "請指定當郵件主體內容包含非 ASCII 字元時，使用哪種編碼來傳送內容。"
 
-#: src/prefs_common.c:1271
+#: src/prefs_common.c:1261
 msgid "Signature separator"
 msgstr "簽名分隔符號"
 
-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1270
 msgid "Insert automatically"
 msgstr "自動加入簽名"
 
-#: src/prefs_common.c:1290
+#: src/prefs_common.c:1280
 msgid "Automatically launch the external editor"
 msgstr "自動呼叫外部編輯器"
 
-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1290
 msgid "Undo level"
 msgstr "復原紀錄"
 
-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1310
 msgid "Wrap messages at"
 msgstr "每行最多"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1322
 msgid "characters"
 msgstr "個字元"
 
-#: src/prefs_common.c:1342
+#: src/prefs_common.c:1332
 msgid "Wrap quotation"
 msgstr "折行時顯示符號"
 
-#: src/prefs_common.c:1348
+#: src/prefs_common.c:1338
 msgid "Wrap on input"
 msgstr "切割輸入過長的文字行"
 
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1340
 msgid "Wrap before sending"
 msgstr "寄送之前自動折行"
 
-#: src/prefs_common.c:1360
+#: src/prefs_common.c:1350
 msgid "Automatically select account for replies"
 msgstr "回信時在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_common.c:1362
+#: src/prefs_common.c:1352
 msgid "Quote message when replying"
 msgstr "回信時引用原文"
 
-#: src/prefs_common.c:1364
+#: src/prefs_common.c:1354
 msgid "Reply button invokes mailing list reply"
 msgstr "讀取 Mailing List 信件時按下「回覆」鈕表示回覆給 Mailing list"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1400
 msgid "Reply format"
 msgstr "回覆格式"
 
-#: src/prefs_common.c:1425 src/prefs_common.c:1464
+#: src/prefs_common.c:1415 src/prefs_common.c:1454
 msgid "Quotation mark"
 msgstr "引言符號"
 
-#: src/prefs_common.c:1449
+#: src/prefs_common.c:1439
 msgid "Forward format"
 msgstr "轉寄格式"
 
-#: src/prefs_common.c:1493
+#: src/prefs_common.c:1483
 msgid " Description of symbols "
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common.c:1534
+#: src/prefs_common.c:1524
 msgid "Font"
 msgstr "字型"
 
-#: src/prefs_common.c:1566
+#: src/prefs_common.c:1556
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "將標頭名稱翻譯出來"
 
-#: src/prefs_common.c:1569
+#: src/prefs_common.c:1559
 msgid "Display unread number next to folder name"
 msgstr "若有未讀信件，就顯示在資料夾名稱後面"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1568
 msgid "Abbreviate newsgroups longer than"
 msgstr "新聞群組縮寫長度大於"
 
-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1583
 msgid "letters"
 msgstr "個字母"
 
-#: src/prefs_common.c:1599
+#: src/prefs_common.c:1589
 msgid "Summary View"
 msgstr "信件列表"
 
-#: src/prefs_common.c:1608
+#: src/prefs_common.c:1598
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "若發信人是你自己，就在信件列表的來源中顯示收信人"
 
-#: src/prefs_common.c:1610
+#: src/prefs_common.c:1600
 msgid "Expand threads"
 msgstr "自動展開信件串列"
 
-#: src/prefs_common.c:1618 src/prefs_common.c:2411 src/prefs_common.c:2449
+#: src/prefs_common.c:1608 src/prefs_common.c:2401 src/prefs_common.c:2439
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1629
 msgid " Set display item of summary... "
 msgstr "設定信件列表選項..."
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1690
 msgid "Enable coloration of message"
 msgstr "信件中的引言與超連結顯示變色"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1704
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1710
 msgid "Display header pane above message view"
 msgstr "在顯示信件欄上方加入標頭資訊"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1717
 msgid "Display short headers on message view"
 msgstr "在信件預覽中顯示信件標頭"
 
-#: src/prefs_common.c:1748
+#: src/prefs_common.c:1738
 msgid "Line space"
 msgstr "行間距"
 
-#: src/prefs_common.c:1762 src/prefs_common.c:1800
+#: src/prefs_common.c:1752 src/prefs_common.c:1790
 msgid "pixel(s)"
 msgstr "像素 (pixels)"
 
-#: src/prefs_common.c:1767
+#: src/prefs_common.c:1757
 msgid "Scroll"
 msgstr "捲軸"
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1764
 msgid "Half page"
 msgstr "一次半頁"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1770
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1776
 msgid "Step"
 msgstr "每次捲動"
 
-#: src/prefs_common.c:1807
+#: src/prefs_common.c:1797
 msgid "Resize attached large images to fit in the window"
 msgstr "調整附加影像大小"
 
-#: src/prefs_common.c:1851
+#: src/prefs_common.c:1841
 msgid "Automatically check signatures"
 msgstr "自動檢查數位簽章"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1844
 msgid "Show signature check result in a popup window"
 msgstr "將數位簽章檢查結果顯示在另一視窗"
 
-#: src/prefs_common.c:1857
+#: src/prefs_common.c:1847
 msgid "Store passphrase in memory temporarily"
 msgstr "將密碼片語暫時存在記憶體中"
 
-#: src/prefs_common.c:1872
+#: src/prefs_common.c:1862
 msgid "Expired after"
 msgstr "期限："
 
-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1875
 msgid "minute(s) "
 msgstr "分鐘"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1888
 msgid ""
 "(Setting to '0' will store the passphrase\n"
 " for the whole session)"
 msgstr "（若設定為 '0' 則表示沒有期限）"
 
-#: src/prefs_common.c:1908
+#: src/prefs_common.c:1898
 msgid "Grab input while entering a passphrase"
 msgstr "輸入 passphrase 時抓取輸入"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1903
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
 
-#: src/prefs_common.c:1964
+#: src/prefs_common.c:1954
 msgid "Always open messages in summary when selected"
 msgstr "在信件列表選擇信件時開啟信件。"
 
-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1958
 msgid "Open first unread message when entering a folder"
 msgstr "進入資料夾時直接跳到第一封未讀信件上"
 
-#: src/prefs_common.c:1972
+#: src/prefs_common.c:1962
 msgid "Only mark message as read when opened in new window"
 msgstr "只在開啟新信件時標示為未讀"
 
-#: src/prefs_common.c:1976
+#: src/prefs_common.c:1966
 msgid "Go to inbox after receiving new mail"
 msgstr "接收完新郵件後直接進入收件夾中"
 
-#: src/prefs_common.c:1984
+#: src/prefs_common.c:1974
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移動或刪除信件時立即執行"
 
-#: src/prefs_common.c:1991
+#: src/prefs_common.c:1981
 msgid ""
 "(Messages will be marked until execution\n"
 " if this is turned off)"
 msgstr "（若此選項關閉，則必須按下「執行」才會執行移動或刪除）"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1987
 msgid "Receive dialog"
 msgstr "接收進度對話盒"
 
-#: src/prefs_common.c:2007
+#: src/prefs_common.c:1997
 msgid "Show receive dialog"
 msgstr "顯示接收信件的進度對話盒"
 
-#: src/prefs_common.c:2017
+#: src/prefs_common.c:2007
 msgid "Always"
 msgstr "一律顯示"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2008
 msgid "Only on manual receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_common.c:2020
+#: src/prefs_common.c:2010
 msgid "Never"
 msgstr "不顯示"
 
-#: src/prefs_common.c:2025
+#: src/prefs_common.c:2015
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不要開啟錯誤視窗。"
 
-#: src/prefs_common.c:2028
+#: src/prefs_common.c:2018
 msgid "Close receive dialog when finished"
 msgstr "完成時關閉接收信件的進度對話盒"
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:2024
 msgid " Set key bindings... "
 msgstr "設定熱鍵"
 
-#: src/prefs_common.c:2090
+#: src/prefs_common.c:2080
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 
-#: src/prefs_common.c:2099
+#: src/prefs_common.c:2089
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2153
 msgid "Add address to destination when double-clicked"
 msgstr "在位址簿中，可利用雙擊直接將該電子郵件加入收信人中"
 
-#: src/prefs_common.c:2165
+#: src/prefs_common.c:2155
 msgid "On exit"
 msgstr "離開設定"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Confirm on exit"
 msgstr "離開時確認"
 
-#: src/prefs_common.c:2180
+#: src/prefs_common.c:2170
 msgid "Empty trash on exit"
 msgstr "離開時清空刪除的郵件"
 
-#: src/prefs_common.c:2182
+#: src/prefs_common.c:2172
 msgid "Ask before emptying"
 msgstr "清除時確認"
 
-#: src/prefs_common.c:2186
+#: src/prefs_common.c:2176
 msgid "Warn if there are queued messages"
 msgstr "離開時若有尚未送出之信件即發出警告"
 
-#: src/prefs_common.c:2192
+#: src/prefs_common.c:2182
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O 等待時間："
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2387
+#: src/prefs_common.c:2377
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2378
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common.c:2390
+#: src/prefs_common.c:2380
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common.c:2391
+#: src/prefs_common.c:2381
 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期與時間（本地時間）"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2382
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common.c:2393
+#: src/prefs_common.c:2383
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common.c:2394
+#: src/prefs_common.c:2384
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common.c:2395
+#: src/prefs_common.c:2385
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common.c:2397
+#: src/prefs_common.c:2387
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2389
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2390
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common.c:2401
+#: src/prefs_common.c:2391
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地時間)"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2393
 msgid "the last two digits of a year"
 msgstr "西元年份的後兩位數字"
 
-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2394
 msgid "the year as a decimal number"
 msgstr "西元年份 (以數字表示)"
 
-#: src/prefs_common.c:2405
+#: src/prefs_common.c:2395
 msgid "the time zone or name or abbreviation"
 msgstr "時區"
 
-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2416
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common.c:2427
+#: src/prefs_common.c:2417
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2457
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common.c:2548
+#: src/prefs_common.c:2538
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2546
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common.c:2590
+#: src/prefs_common.c:2580
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2586
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2592
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2665
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2668
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2671
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2674
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2811
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common.c:2877
+#: src/prefs_common.c:2867
 msgid ""
 "Date\n"
 "From\n"
@@ -4837,11 +4763,11 @@ msgstr ""
 "新聞群組\n"
 "信件識別碼"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2880
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示常規表示式"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4855,7 +4781,7 @@ msgstr ""
 "引言（不含簽名）\n"
 "% 符號"
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2892
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4867,15 +4793,15 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common.c:2939
+#: src/prefs_common.c:2929
 msgid "Font selection"
 msgstr "選擇字型"
 
-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2993
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common.c:3017
+#: src/prefs_common.c:3007
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4885,31 +4811,31 @@ msgstr ""
 "您也可以更改每個目錄的熱鍵，您只需要將滑鼠指標指過去，\n"
 "並按下任何鍵即可。"
 
-#: src/prefs_common.c:3029 src/prefs_common.c:3377
+#: src/prefs_common.c:3019 src/prefs_common.c:3368
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common.c:3032 src/prefs_common.c:3386
+#: src/prefs_common.c:3022 src/prefs_common.c:3377
 msgid "Old Sylpheed"
 msgstr "舊設定"
 
-#: src/prefs_customheader.c:163
+#: src/prefs_customheader.c:164
 msgid "Custom header setting"
 msgstr "使用者自定標頭"
 
-#: src/prefs_customheader.c:259
+#: src/prefs_customheader.c:260
 msgid "Custom headers"
 msgstr "標頭"
 
-#: src/prefs_customheader.c:480 src/prefs_display_header.c:522
+#: src/prefs_customheader.c:481 src/prefs_display_header.c:523
 msgid "Header name is not set."
 msgstr "標頭未設定"
 
-#: src/prefs_customheader.c:538
+#: src/prefs_customheader.c:539
 msgid "Delete header"
 msgstr "刪除資料夾"
 
-#: src/prefs_customheader.c:539
+#: src/prefs_customheader.c:540
 msgid "Do you really want to delete this header?"
 msgstr "您確定要刪除這項規則嗎？"
 
@@ -4917,143 +4843,143 @@ msgstr "您確定要刪除這項規則嗎？"
 msgid "Creating display header setting window...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/prefs_display_header.c:198
+#: src/prefs_display_header.c:199
 msgid "Display header setting"
 msgstr "顯示標頭設定"
 
-#: src/prefs_display_header.c:218
+#: src/prefs_display_header.c:219
 msgid "Header name"
 msgstr "信件標頭設定"
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:251
 msgid "Displayed Headers"
 msgstr "指定顯示標頭"
 
-#: src/prefs_display_header.c:308
+#: src/prefs_display_header.c:309
 msgid "Hidden headers"
 msgstr "未指定標頭"
 
-#: src/prefs_display_header.c:337
+#: src/prefs_display_header.c:338
 msgid "Show all unspecified headers"
 msgstr "顯示所有未指定的標頭"
 
-#: src/prefs_display_header.c:362
+#: src/prefs_display_header.c:363
 msgid "Reading configuration for displaying headers...\n"
 msgstr "讀取標頭顯示的設定中...\n"
 
-#: src/prefs_display_header.c:400
+#: src/prefs_display_header.c:401
 msgid "Writing configuration for displaying headers...\n"
 msgstr "寫入過濾信件的設定中...\n"
 
-#: src/prefs_display_header.c:532
+#: src/prefs_display_header.c:533
 msgid "This header is already in the list."
 msgstr "這個標頭已存在。"
 
-#: src/prefs_filter.c:189
+#: src/prefs_filter.c:190
 msgid "Filter setting"
 msgstr "信件過濾設定"
 
-#: src/prefs_filter.c:212
+#: src/prefs_filter.c:213
 msgid "Enabled"
 msgstr "已開啟"
 
-#: src/prefs_filter.c:236
+#: src/prefs_filter.c:237
 msgid "Top"
 msgstr "到頂端"
 
-#: src/prefs_filter.c:258
+#: src/prefs_filter.c:259
 msgid "Bottom"
 msgstr "到底端"
 
-#: src/prefs_filter.c:286
+#: src/prefs_filter.c:287
 msgid "Copy"
 msgstr "複製"
 
-#: src/prefs_filter.c:698
+#: src/prefs_filter.c:699
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filter.c:699
+#: src/prefs_filter.c:700
 msgid "Do you really want to delete this rule?"
 msgstr "您確定要刪除這項規則嗎？"
 
-#: src/prefs_filter_edit.c:337
+#: src/prefs_filter_edit.c:338
 msgid "Filter rule"
 msgstr "信件過濾規則"
 
-#: src/prefs_filter_edit.c:370
+#: src/prefs_filter_edit.c:371
 msgid "If any of the following condition matches"
 msgstr "下列任一條件符合"
 
-#: src/prefs_filter_edit.c:372
+#: src/prefs_filter_edit.c:373
 msgid "If all of the following conditions match"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_filter_edit.c:393
+#: src/prefs_filter_edit.c:394
 msgid "Perform the following actions:"
 msgstr "執行下列動作："
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:562
 msgid "To or Cc"
 msgstr "To 或 Cc"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:563
 msgid "Any header"
 msgstr "任一個標頭"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:564
 msgid "Edit header..."
 msgstr "編輯信件標頭..."
 
-#: src/prefs_filter_edit.c:566
+#: src/prefs_filter_edit.c:567
 msgid "Message body"
 msgstr "信件內容"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:568
 msgid "Result of command"
 msgstr "執行結果"
 
-#: src/prefs_filter_edit.c:569
+#: src/prefs_filter_edit.c:570
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:582
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_filter_edit.c:583
+#: src/prefs_filter_edit.c:584
 msgid "doesn't contain"
 msgstr "不包含"
 
-#: src/prefs_filter_edit.c:585
+#: src/prefs_filter_edit.c:586
 msgid "is"
 msgstr "是"
 
-#: src/prefs_filter_edit.c:587
+#: src/prefs_filter_edit.c:588
 msgid "is not"
 msgstr "不是"
 
-#: src/prefs_filter_edit.c:589
+#: src/prefs_filter_edit.c:590
 msgid "match to regex"
 msgstr "符合常規表示式"
 
-#: src/prefs_filter_edit.c:591
+#: src/prefs_filter_edit.c:592
 msgid "doesn't match to regex"
 msgstr "不符合常規表示式"
 
-#: src/prefs_filter_edit.c:599
+#: src/prefs_filter_edit.c:600
 msgid "is larger than"
 msgstr "大於"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:601
 msgid "is smaller than"
 msgstr "小於"
 
-#: src/prefs_filter_edit.c:607
+#: src/prefs_filter_edit.c:608
 msgid "is longer than"
 msgstr "長於"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:609
 msgid "is shorter than"
 msgstr "短於"
 
@@ -5101,23 +5027,23 @@ msgstr "執行命令"
 msgid "Stop rule evaluation"
 msgstr "停止檢查規則"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1059
+#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
 msgid "folder:"
 msgstr "資料夾："
 
-#: src/prefs_filter_edit.c:1099
+#: src/prefs_filter_edit.c:1098
 msgid "address:"
 msgstr "位址："
 
-#: src/prefs_filter_edit.c:1506
+#: src/prefs_filter_edit.c:1505
 msgid "Edit header list"
 msgstr "編輯信件標頭清單"
 
-#: src/prefs_filter_edit.c:1529
+#: src/prefs_filter_edit.c:1528
 msgid "Headers"
 msgstr "信件標頭"
 
-#: src/prefs_filter_edit.c:1540
+#: src/prefs_filter_edit.c:1539
 msgid "Header:"
 msgstr "信件標頭："
 
@@ -5282,7 +5208,7 @@ msgstr "刪除信件樣板"
 msgid "Do you really want to delete this template?"
 msgstr "您確定要刪除這個信件樣板嗎？"
 
-#: src/procmime.c:742
+#: src/procmime.c:728
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
@@ -5305,11 +5231,11 @@ msgstr "暫存資料夾中的信件（編號：%d）寄送失敗。\n"
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：`%s'\n"
 
-#: src/progressdialog.c:53
+#: src/progressdialog.c:54
 msgid "Status"
 msgstr "狀態"
 
-#: src/progressdialog.c:55
+#: src/progressdialog.c:56
 msgid "Creating progress dialog...\n"
 msgstr ""
 
@@ -5321,97 +5247,66 @@ msgstr "抓取資料時發生錯誤。\n"
 msgid "Can't write to file.\n"
 msgstr "無法寫入檔案。\n"
 
-#: src/rfc2015.c:131 src/rfc2015.c:166 src/sigstatus.c:220
-msgid "Oops: Signature not verified"
-msgstr "警告：簽章未被檢查"
-
-#: src/rfc2015.c:134 src/rfc2015.c:169 src/sigstatus.c:223
-msgid "No signature found"
-msgstr "未發現簽章"
-
-#: src/rfc2015.c:137 src/sigstatus.c:226 src/textview.c:513
-msgid "Good signature"
-msgstr "簽章檢查正確"
-
-#: src/rfc2015.c:140 src/sigstatus.c:229 src/textview.c:515
-msgid "BAD signature"
-msgstr "簽章檢查錯誤"
-
-#: src/rfc2015.c:143 src/rfc2015.c:178 src/sigstatus.c:232
-msgid "No public key to verify the signature"
-msgstr "沒有公開鑰匙供檢查簽章"
-
-#: src/rfc2015.c:146 src/rfc2015.c:181 src/sigstatus.c:235
-msgid "Error verifying the signature"
-msgstr "檢查簽章時發生錯誤"
-
-#: src/rfc2015.c:149 src/rfc2015.c:184
-msgid "Different results for signatures"
-msgstr "簽章檢查結果錯誤"
-
-#: src/rfc2015.c:152 src/rfc2015.c:187
-msgid "Error: Unknown status"
-msgstr "錯誤：不明的狀態"
-
-#: src/rfc2015.c:172
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "來自 %s 的簽章檢查正確"
-
-#: src/rfc2015.c:175
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "來自 \"%s\" 的簽章檢查錯誤"
-
-#: src/rfc2015.c:207
+#: src/rfc2015.c:137
 msgid "Cannot find user ID for this key."
 msgstr "無法在這個 key 中找到使用者代號"
 
-#: src/rfc2015.c:218
+#: src/rfc2015.c:148
 #, c-format
-msgid "                aka \"%s\"\n"
-msgstr "                又稱為 \"%s\"\n"
+msgid "\t\taka \"%s\"\n"
+msgstr ""
 
-#: src/rfc2015.c:246
+#: src/rfc2015.c:175
 #, c-format
 msgid "Signature made at %s\n"
 msgstr "產生簽章於 %s\n"
 
-#: src/rfc2015.c:255
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "鑰匙的 fingerprint: %s\n"
+#: src/rfc2015.c:277 src/sigstatus.c:255
+msgid "Error verifying the signature"
+msgstr "檢查簽章時發生錯誤"
 
-#: src/select-keys.c:102
+#: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
 msgstr "請選擇 %s 的鑰匙"
 
-#: src/select-keys.c:105
+#: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
 msgstr "收集 %s 的資訊中 ... %c"
 
-#: src/select-keys.c:271
+#: src/select-keys.c:291
 msgid "Select Keys"
 msgstr "選擇鑰匙"
 
-#: src/select-keys.c:298
+#: src/select-keys.c:318
 msgid "Key ID"
 msgstr "鑰匙識別碼"
 
-#: src/select-keys.c:301
+#: src/select-keys.c:321
 msgid "Val"
 msgstr "值"
 
-#: src/select-keys.c:445
+#: src/select-keys.c:468
 msgid "Add key"
 msgstr "新增鑰匙"
 
-#: src/select-keys.c:446
+#: src/select-keys.c:469
 msgid "Enter another user or key ID:"
 msgstr "請輸入其他的使用者或鑰匙識別碼"
 
+#: src/select-keys.c:485
+msgid "Trust key"
+msgstr ""
+
+#: src/select-keys.c:486
+msgid ""
+"The selected key is not fully trusted.\n"
+"If you choose to encrypt the message with this key you don't\n"
+"know for sure that it will go to the person you mean it to.\n"
+"Do you trust it enough to use it anyway?"
+msgstr ""
+
 #: src/send_message.c:177
 msgid "Queued message header is broken.\n"
 msgstr "暫存資料夾中的信件標頭錯誤。\n"
@@ -5499,15 +5394,78 @@ msgstr ""
 "直接使用。\n"
 "如果您不確定有沒有，請直接按下「確定」。"
 
-#: src/sigstatus.c:130
+#: src/sigstatus.c:131
 msgid "Checking signature"
 msgstr "檢查數位簽章"
 
-#: src/sigstatus.c:197
+#: src/sigstatus.c:195
 #, c-format
 msgid "%s%s%s from \"%s\""
 msgstr ""
 
+#: src/sigstatus.c:218
+msgid "No signature found"
+msgstr "未發現簽章"
+
+#: src/sigstatus.c:225
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "來自 %s 的簽章檢查正確"
+
+#: src/sigstatus.c:226 src/textview.c:529
+msgid "Good signature"
+msgstr "簽章檢查正確"
+
+#: src/sigstatus.c:230
+#, c-format
+msgid "Valid signature but the key for \"%s\" is not trusted"
+msgstr ""
+
+#: src/sigstatus.c:231 src/textview.c:531
+msgid "Valid signature (untrusted key)"
+msgstr ""
+
+#: src/sigstatus.c:236
+#, c-format
+msgid "Signature valid but expired for \"%s\""
+msgstr ""
+
+#: src/sigstatus.c:237
+#, fuzzy
+msgid "Signature valid but expired"
+msgstr "產生簽章於 %s\n"
+
+#: src/sigstatus.c:240
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has expired"
+msgstr ""
+
+#: src/sigstatus.c:241
+msgid "Signature valid but the signing key has expired"
+msgstr ""
+
+#: src/sigstatus.c:244
+#, c-format
+msgid "Signature valid but the signing key for \"%s\" has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:245
+msgid "Signature valid but the signing key has been revoked"
+msgstr ""
+
+#: src/sigstatus.c:248
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "來自 \"%s\" 的簽章檢查錯誤"
+
+#: src/sigstatus.c:249 src/textview.c:533
+msgid "BAD signature"
+msgstr "簽章檢查錯誤"
+
+#: src/sigstatus.c:252
+msgid "No public key to verify the signature"
+msgstr "沒有公開鑰匙供檢查簽章"
+
 #: src/smtp.c:151
 msgid "SMTP AUTH not available\n"
 msgstr "不支援 SMTP 認證\n"
@@ -5710,255 +5668,255 @@ msgstr ""
 msgid "Creating summary view...\n"
 msgstr ""
 
-#: src/summaryview.c:596
+#: src/summaryview.c:579
 msgid "Process mark"
 msgstr "信件標記"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:580
 msgid "Some marks are left. Process it?"
 msgstr "某些信件已被標記。要繼續嗎？"
 
-#: src/summaryview.c:645
+#: src/summaryview.c:628
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾(%s)..."
 
-#: src/summaryview.c:936 src/summaryview.c:960
+#: src/summaryview.c:919 src/summaryview.c:943
 msgid "No more unread messages"
 msgstr "沒有其他未讀信件"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:920
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀信件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:946
+#: src/summaryview.c:929
 msgid "No unread messages."
 msgstr "沒有未讀信件"
 
-#: src/summaryview.c:961
+#: src/summaryview.c:944
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀信件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:963 src/summaryview.c:1021
+#: src/summaryview.c:946 src/summaryview.c:1005
 msgid "Search again"
 msgstr "再次搜尋"
 
-#: src/summaryview.c:994 src/summaryview.c:1018
+#: src/summaryview.c:978 src/summaryview.c:1002
 msgid "No more new messages"
 msgstr "沒有其他新信件"
 
-#: src/summaryview.c:995
+#: src/summaryview.c:979
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新信件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1004
+#: src/summaryview.c:988
 msgid "No new messages."
 msgstr "沒有新信件"
 
-#: src/summaryview.c:1019
+#: src/summaryview.c:1003
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新信件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1052 src/summaryview.c:1077
+#: src/summaryview.c:1037 src/summaryview.c:1062
 msgid "No more marked messages"
 msgstr "沒有其他已標記信件"
 
-#: src/summaryview.c:1053
+#: src/summaryview.c:1038
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記信件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1062 src/summaryview.c:1087
+#: src/summaryview.c:1047 src/summaryview.c:1072
 msgid "No marked messages."
 msgstr "沒有已標記信件"
 
-#: src/summaryview.c:1078
+#: src/summaryview.c:1063
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記信件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1102 src/summaryview.c:1127
+#: src/summaryview.c:1087 src/summaryview.c:1112
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之信件"
 
-#: src/summaryview.c:1103
+#: src/summaryview.c:1088
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之信件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1112 src/summaryview.c:1137
+#: src/summaryview.c:1097 src/summaryview.c:1122
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之信件"
 
-#: src/summaryview.c:1128
+#: src/summaryview.c:1113
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之信件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1337 src/summaryview.c:1339
+#: src/summaryview.c:1322 src/summaryview.c:1324
 msgid "Attracting messages by subject..."
 msgstr "展開信件中..."
 
-#: src/summaryview.c:1481
+#: src/summaryview.c:1466
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1485
+#: src/summaryview.c:1470
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1486 src/summaryview.c:1493
+#: src/summaryview.c:1471 src/summaryview.c:1478
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1476
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1508
+#: src/summaryview.c:1493
 msgid " item(s) selected"
 msgstr "封已選擇"
 
-#: src/summaryview.c:1518
+#: src/summaryview.c:1503
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1524
+#: src/summaryview.c:1509
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:1674 src/summaryview.c:1675
+#: src/summaryview.c:1659 src/summaryview.c:1660
 msgid "Sorting summary..."
 msgstr "信件排序中..."
 
-#: src/summaryview.c:1744
+#: src/summaryview.c:1729
 msgid "\tSetting summary from message data..."
 msgstr "\t產生信件列表中..."
 
-#: src/summaryview.c:1746
+#: src/summaryview.c:1731
 msgid "Setting summary from message data..."
 msgstr "產生信件列表中..."
 
-#: src/summaryview.c:1833
+#: src/summaryview.c:1818
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入快取(%s)..."
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1875
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2228
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "信件 %d 已標記\n"
 
-#: src/summaryview.c:2278
+#: src/summaryview.c:2263
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "信件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2343
+#: src/summaryview.c:2328
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "信件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2375
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "信件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:2410
+#: src/summaryview.c:2395
 msgid "Delete message(s)"
 msgstr "刪除信件"
 
-#: src/summaryview.c:2411
+#: src/summaryview.c:2396
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封信件嗎？"
 
-#: src/summaryview.c:2452 src/summaryview.c:2454
+#: src/summaryview.c:2437 src/summaryview.c:2439
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的信件..."
 
-#: src/summaryview.c:2503
+#: src/summaryview.c:2488
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "信件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:2545
+#: src/summaryview.c:2530
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "信件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:2560
+#: src/summaryview.c:2545
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同"
 
-#: src/summaryview.c:2610
+#: src/summaryview.c:2595
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "信件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:2625
+#: src/summaryview.c:2610
 msgid "Destination for copy is same as current folder."
 msgstr "信件無法複製到同一個資料夾內"
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2659
 msgid "Selecting all messages..."
 msgstr "選擇所有的信件..."
 
-#: src/summaryview.c:2805
+#: src/summaryview.c:2790
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3050 src/summaryview.c:3051
+#: src/summaryview.c:3035 src/summaryview.c:3036
 msgid "Building threads..."
 msgstr "產生信件串列中..."
 
-#: src/summaryview.c:3133 src/summaryview.c:3134
+#: src/summaryview.c:3118 src/summaryview.c:3119
 msgid "Unthreading..."
 msgstr "解除信件串列中..."
 
-#: src/summaryview.c:3173
+#: src/summaryview.c:3158
 msgid "Unthreading for execution..."
 msgstr "解除信件串列中..."
 
-#: src/summaryview.c:3263
+#: src/summaryview.c:3248
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:3264
+#: src/summaryview.c:3249
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:3304
+#: src/summaryview.c:3289
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封信件"
 
-#: src/template.c:169
+#: src/template.c:171
 #, c-format
 msgid "file %s already exists\n"
 msgstr "檔案 %s 已存在。\n"
 
-#: src/textview.c:186
+#: src/textview.c:193
 msgid "Creating text view...\n"
 msgstr "產生文字視窗...\n"
 
-#: src/textview.c:578
+#: src/textview.c:596
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:594
+#: src/textview.c:612
 msgid "To save this part, pop up the context menu with "
 msgstr "要儲存這個檔案，請按滑鼠右鍵並在目錄中"
 
-#: src/textview.c:595
+#: src/textview.c:613
 msgid "right click and select `Save as...', "
 msgstr "選擇『另存新檔』...，或者是按下 `y' 鍵。"
 
-#: src/textview.c:596
+#: src/textview.c:614
 msgid ""
 "or press `y' key.\n"
 "\n"
@@ -5966,11 +5924,11 @@ msgstr ""
 "或者是按下 `y' 鍵。\n"
 "\n"
 
-#: src/textview.c:598
+#: src/textview.c:616
 msgid "To display this part as a text message, select "
 msgstr "要以文字模式觀看這個檔案，請選擇"
 
-#: src/textview.c:599
+#: src/textview.c:617
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -5978,35 +5936,35 @@ msgstr ""
 "『以純文字呈現』，或者是按下 `t' 鍵。\n"
 "\n"
 
-#: src/textview.c:601
+#: src/textview.c:619
 msgid "To open this part with external program, select "
 msgstr "要以其他程式開啟這個檔案，請選擇"
 
-#: src/textview.c:602
+#: src/textview.c:620
 msgid "`Open' or `Open with...', "
 msgstr "『開啟』或『以別的程式開啟』，"
 
-#: src/textview.c:603
+#: src/textview.c:621
 msgid "or double-click, or click the center button, "
 msgstr "也可以雙擊該檔案，或是按滑鼠中鍵，"
 
-#: src/textview.c:604
+#: src/textview.c:622
 msgid "or press `l' key."
 msgstr "或是按 `l' 鍵。"
 
-#: src/textview.c:622
+#: src/textview.c:640
 msgid "This signature has not been checked yet.\n"
 msgstr "這個數位簽章尚未經過檢查\n"
 
-#: src/textview.c:623
+#: src/textview.c:641
 msgid "To check it, pop up the context menu with\n"
 msgstr "要檢查數位簽章，請按下滑鼠右鍵並在目錄中\n"
 
-#: src/textview.c:624
+#: src/textview.c:642
 msgid "right click and select `Check signature'.\n"
 msgstr "選擇「檢查數位簽章」。\n"
 
-#: src/textview.c:1622
+#: src/textview.c:1640
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6041,6 +5999,42 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
 
+#~ msgid "OK"
+#~ msgstr "確定"
+
+#~ msgid "Close"
+#~ msgstr "關閉"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "No"
+#~ msgstr "不要"
+
+#~ msgid "Refresh"
+#~ msgstr "刷新"
+
+#~ msgid "Search"
+#~ msgstr "尋找"
+
+#~ msgid "Apply"
+#~ msgstr "套用"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "警告：簽章未被檢查"
+
+#~ msgid "Different results for signatures"
+#~ msgstr "簽章檢查結果錯誤"
+
+#~ msgid "Error: Unknown status"
+#~ msgstr "錯誤：不明的狀態"
+
+#~ msgid "                aka \"%s\"\n"
+#~ msgstr "                又稱為 \"%s\"\n"
+
+#~ msgid "Key fingerprint: %s\n"
+#~ msgstr "鑰匙的 fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "找到標籤: %s\n"