updated po files.

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

30 files changed, 3060 insertions, 2910 deletions

diff --git a/po/be.po b/po/be.po
index a6b5d8c4..9b0c1c95 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -689,7 +689,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -990,7 +990,7 @@ msgid "Address book"
 msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Каталог"
@@ -999,7 +999,7 @@ msgstr "Каталог"
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
@@ -1019,7 +1019,7 @@ msgid "Bcc:"
 msgstr "Скр.копія:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1041,7 +1041,7 @@ msgstr "Пошук"
 msgid "_Close"
 msgstr "За_крыць"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зарэгістраваныя шаблоны"
@@ -1055,7 +1055,7 @@ msgstr "Выдаліць адрас(ы)"
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды выдаліць гэты адрас(ы)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1064,36 +1064,36 @@ msgstr ""
 "Ці сапраўды жадаеце выдаліць каталог І ўсе адрасы ў `%s' ?\n"
 "Пры выдаленні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Выдаліць каталог"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Каталог і адрас(ы)"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды выдаліць `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова сканвертаваная."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1101,7 +1101,7 @@ msgstr ""
 "Старая адрасная кніга сканвертаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1125,15 +1125,15 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1141,76 +1141,76 @@ msgid ""
 "%s%c%s"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1222,7 +1222,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1589,7 +1589,7 @@ msgstr "Файл %s не існуе\n"
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
@@ -1646,7 +1646,7 @@ msgstr "Праверыць атрымальнікаў"
 msgid "Really send this mail to the following addresses?"
 msgstr "Насамрэч даслаць гэты ліст на наступныя адрасы?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
@@ -1658,11 +1658,11 @@ msgstr "Тэма:"
 msgid "_Send"
 msgstr "Адпра_віць"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1670,38 +1670,38 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўленнем."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Нельга запісаць паведамленне ў `Дасланыя'."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Нельга падпісаць паведамленне."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Нельга зашыфраваць паведамленне."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Нельга зашыфраваць ці падпісаць паведамленне."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1712,11 +1712,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1729,15 +1729,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1751,92 +1751,92 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "даданне паведамлення ў чаргу...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Стварэнне вакна напісання...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Уласцівасці"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Назва файла"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1845,48 +1845,48 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -2370,7 +2370,7 @@ msgstr "Новы"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Нечытаны"
 
@@ -5906,7 +5906,7 @@ msgstr "Вынік загаду"
 msgid "Age"
 msgstr "Узрост"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Маркіраваны"
 
@@ -6481,41 +6481,46 @@ msgstr "Месца:"
 msgid "Folder name:"
 msgstr "Назва каталогу:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Усе"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Мае каляровую метку"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Мае дадаткі"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "У межах 1 дня"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Апошнія 5 дзен"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Апошнія 5 дзен"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Адрасная кніга"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Шукаць Тэму ці Адпраўніка"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Няма новых паведамленняў."
diff --git a/po/bg.po b/po/bg.po
index 70aae0ef..f9d76b86 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -689,7 +689,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -996,7 +996,7 @@ msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
@@ -1005,7 +1005,7 @@ msgstr "Папка"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
@@ -1026,7 +1026,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1050,7 +1050,7 @@ msgstr "Търсене"
 msgid "_Close"
 msgstr "Затваряне"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
@@ -1064,7 +1064,7 @@ msgstr "Изтриване на адрес(ите)"
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,38 +1074,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1113,7 +1113,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1121,7 +1121,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1137,17 +1137,17 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1155,80 +1155,80 @@ msgid ""
 "%s%c%s"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1240,7 +1240,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1648,7 +1648,7 @@ msgstr "Файлът %s не съществува\n"
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
@@ -1708,7 +1708,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
@@ -1721,11 +1721,11 @@ msgstr "Тема:"
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1733,40 +1733,40 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1777,12 +1777,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1791,15 +1791,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1808,94 +1808,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Аксесоари"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1905,52 +1905,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2443,7 +2443,7 @@ msgstr "Нови"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Непрочетени"
 
@@ -6078,7 +6078,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Макиране"
@@ -6700,44 +6700,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Име на файл"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Цветен _етикет"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Притурка"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Фамилия"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Фамилия"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Адресна книга"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Няма нови съобщения."
diff --git a/po/cs.po b/po/cs.po
index 2c72fafb..2d39c920 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2010-01-12 22:42+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -694,7 +694,7 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Složka"
@@ -1004,7 +1004,7 @@ msgstr "Složka"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Hledat:"
 
@@ -1024,7 +1024,7 @@ msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1046,7 +1046,7 @@ msgstr "Hledat"
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Přidané šablony"
@@ -1060,7 +1060,7 @@ msgstr "Smazat adresy"
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1069,36 +1069,36 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1106,7 +1106,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1130,15 +1130,15 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1149,72 +1149,72 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adresářem"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konverze adresáře nemohla být provedena, ale byly vytvořeny nové prázdné "
 "soubory adresáře."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1226,7 +1226,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1593,7 +1593,7 @@ msgstr "Soubor %s neexistuje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
@@ -1650,7 +1650,7 @@ msgstr "Zkontrolovat příjemce"
 msgid "Really send this mail to the following addresses?"
 msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
@@ -1662,11 +1662,11 @@ msgstr "Předmět:"
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,38 +1674,38 @@ msgstr ""
 "Není zadán účet k odesílání e-mailů.\n"
 "Před odesláním prosím vyberte nějaký účet."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným ID klíče \"%s\"."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Zprávu nelze podepsat."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Zprávu nelze šifrovat."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Zprávu nelze šifrovat nebo podepsat."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1716,11 +1716,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1733,15 +1733,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1755,92 +1755,92 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,48 +1849,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Uložit do složky konceptů?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -2365,7 +2365,7 @@ msgstr "Nové"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepřečtené"
 
@@ -5880,7 +5880,7 @@ msgstr "Výsledek příkazu"
 msgid "Age"
 msgstr "Stáří"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Označené"
 
@@ -6452,40 +6452,45 @@ msgstr "Umístění:"
 msgid "Folder name:"
 msgstr "Název složky:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Vše"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "S barevným štítkem"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "S přílohou"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Za den"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Za posledních pět dnů"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 msgid "Last 7 days"
 msgstr "Za posledních sedm dnů"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adresář"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Hledat předmět nebo odesílatele"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr "%1$d v %2$d vyhovuje"
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, c-format
 msgid "No messages matched"
 msgstr "Žádná ze zpráv nevyhovuje"
diff --git a/po/da.po b/po/da.po
index 8efc657a..125ede53 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -693,7 +693,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1000,7 +1000,7 @@ msgid "Address book"
 msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappe"
@@ -1009,7 +1009,7 @@ msgstr "Mappe"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
@@ -1030,7 +1030,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1054,7 +1054,7 @@ msgstr "Søg"
 msgid "_Close"
 msgstr "Luk"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
@@ -1068,7 +1068,7 @@ msgstr "Slet adresse(r)"
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1077,38 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1158,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammel adressebog konverteret men kunne ikke gemme ny index fil "
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kunne ikke konvertere adressebog, men har oprettet nye tomme filer "
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1238,7 +1238,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Note"
 
@@ -1646,7 +1646,7 @@ msgstr "Filen %s findes ikke\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
@@ -1706,7 +1706,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
@@ -1719,11 +1719,11 @@ msgstr "Emne:"
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1731,40 +1731,40 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1775,12 +1775,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1789,15 +1789,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1806,94 +1806,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Egenskaber"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1903,52 +1903,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2441,7 +2441,7 @@ msgstr "Ny"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ulæst"
 
@@ -6075,7 +6075,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Markér"
@@ -6696,44 +6696,49 @@ msgstr "Afbryd handling"
 msgid "Folder name:"
 msgstr "Fil navn"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Farve la_bel"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Vedhæftet"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Efternavn"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Efternavn"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adressebog"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Ingen besked del valgt."
diff --git a/po/de.po b/po/de.po
index e23fab35..e1bff846 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -694,7 +694,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Ablage"
@@ -1004,7 +1004,7 @@ msgstr "Ablage"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Suchen:"
 
@@ -1024,7 +1024,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1046,7 +1046,7 @@ msgstr "Suchen"
 msgid "_Close"
 msgstr "_Schließen"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrierte Schablonen"
@@ -1060,7 +1060,7 @@ msgstr "Adresse(n) löschen"
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1070,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1147,78 @@ msgid ""
 "%s%c%s"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Altes Adressbuch konvertiert, neue Adress-Index-Datei konnte nicht "
 "gespeichert werden"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, erstellte aber neue leere Adressbuch "
 "Dateien."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, konnte neue Adressbuch Dateien nicht "
 "erstellen."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren und konnte neue Adressbuch Dateien "
 "nicht erstellen."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1230,7 +1230,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1597,7 +1597,7 @@ msgstr "Datei %s existiert nicht\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
@@ -1656,7 +1656,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
@@ -1669,11 +1669,11 @@ msgstr "Betreff:"
 msgid "_Send"
 msgstr "Senden"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1681,40 +1681,40 @@ 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:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1725,11 +1725,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1742,15 +1742,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1764,92 +1764,92 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Eigenschaften"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1858,48 +1858,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Werkzeugleiste anpassen"
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2383,7 +2383,7 @@ msgstr "Neu"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -5938,7 +5938,7 @@ msgstr "Ergebnis des Befehls"
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Markiert"
 
@@ -6516,41 +6516,46 @@ msgstr "Speicherort:"
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Alle"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Hat Farbetikett"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Hat Anhang"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Innerhalb eines Tages"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Vergangene 5 Tage"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Vergangene 5 Tage"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adressbuch"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Suche nach Betreff oder Absender"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Keine neuen Nachrichten."
diff --git a/po/el.po b/po/el.po
index 941dd952..f1b597e8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -706,7 +706,7 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1009,7 +1009,7 @@ msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Φάκελος"
@@ -1018,7 +1018,7 @@ msgstr "Φάκελος"
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
@@ -1038,7 +1038,7 @@ msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1060,7 +1060,7 @@ msgstr "Αναζήτηση"
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
@@ -1074,7 +1074,7 @@ msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1083,37 +1083,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1139,7 +1139,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1147,17 +1147,17 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1165,19 +1165,19 @@ msgid ""
 "%s%c%s"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1185,7 +1185,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1193,7 +1193,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1201,51 +1201,51 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Ομάδα"
 
 # Untrans.
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -1257,7 +1257,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1627,7 +1627,7 @@ msgstr "Το αρχείο %s δεν υπάρχει\n"
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
@@ -1686,7 +1686,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
@@ -1699,11 +1699,11 @@ msgstr "Θέμα:"
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,43 +1711,43 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1758,11 +1758,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1775,15 +1775,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1797,95 +1797,95 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Ιδιότητες"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1895,49 +1895,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2428,7 +2428,7 @@ msgstr "Νέα"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
@@ -6002,7 +6002,7 @@ msgstr "Αποτέλεσμα εντολής"
 msgid "Age"
 msgstr "Παλαιότητα"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Σημειωμένο"
 
@@ -6580,43 +6580,48 @@ msgstr "Τοποθεσία: "
 msgid "Folder name:"
 msgstr "Όνομα φακέλου:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Όλα"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "Το χρώμα της ετικέτας για το URL"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Έχει συνημμένο"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Επώνυμο"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Επώνυμο"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Κατάλογος διευθύνσεων"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Αναζήτηση για Θέμα ή Από"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Δεν υπάρχουν νέα μηνύματα."
diff --git a/po/es.po b/po/es.po
index cbe1d309..0e8cf052 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -692,7 +692,7 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -993,7 +993,7 @@ msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
@@ -1002,7 +1002,7 @@ msgstr "Carpeta"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Buscar:"
 
@@ -1022,7 +1022,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1044,7 +1044,7 @@ msgstr "Buscar"
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Plantillas registradas"
@@ -1058,7 +1058,7 @@ msgstr "Borrar dirección(es)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1067,36 +1067,36 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1104,7 +1104,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1120,7 +1120,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1128,15 +1128,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1144,78 +1144,78 @@ msgid ""
 "%s%c%s"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
 "fichero índice"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
 "vacíos."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
 "para la nueva."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
 "una nueva."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1227,7 +1227,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1594,7 +1594,7 @@ msgstr "El fichero %s no existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tamaño de %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
@@ -1651,7 +1651,7 @@ msgstr "Comprobar destinatarios"
 msgid "Really send this mail to the following addresses?"
 msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
@@ -1663,11 +1663,11 @@ msgstr "Asunto:"
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1675,39 +1675,39 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID de clave seleccionado "
 "actualmente «%s»."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "El mensaje no se puede firmar."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "El mensaje no se puede cifrar."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "El mensaje no se puede cifrar o firmar."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1718,11 +1718,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1735,15 +1735,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1757,92 +1757,92 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Propiedades"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1851,48 +1851,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2378,7 +2378,7 @@ msgstr "Nuevos"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "No leídos"
 
@@ -5917,7 +5917,7 @@ msgstr "Resultado de una orden"
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Marcado"
 
@@ -6492,41 +6492,46 @@ msgstr "Ubicación:"
 msgid "Folder name:"
 msgstr "Nombre de carpeta:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Todos"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Tiene etiqueta de color"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Tiene adjunto"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "En 1 día"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Los últimos 5 días"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Los últimos 5 días"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Agenda de direcciones"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Buscar por Asunto o Desde"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "No hay mensajes nuevos."
diff --git a/po/et.po b/po/et.po
index 08180aa0..5b91a723 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -697,7 +697,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1002,7 +1002,7 @@ msgid "Address book"
 msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Kaust"
@@ -1011,7 +1011,7 @@ msgstr "Kaust"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
@@ -1032,7 +1032,7 @@ msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1056,7 +1056,7 @@ msgstr "Otsi"
 msgid "_Close"
 msgstr "Sulge"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
@@ -1070,7 +1070,7 @@ msgstr "Kustuta aadress(id)"
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,38 +1079,38 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1118,7 +1118,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1126,7 +1126,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1134,7 +1134,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1142,17 +1142,17 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1160,80 +1160,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Uuendati vana aadressiraamat, kuid ei suudetud salvestada uut indeksifaili"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, kuid loodi tühjad ja uued "
 "aadressiraamatu failid."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut ja ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,7 +1245,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1654,7 +1654,7 @@ msgstr "Faili %s ei leidu\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
@@ -1714,7 +1714,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
@@ -1727,11 +1727,11 @@ msgstr "Pealkiri:"
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1739,41 +1739,41 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1783,12 +1783,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1797,15 +1797,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1814,95 +1814,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1912,52 +1912,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2451,7 +2451,7 @@ msgstr "Uus"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Pole loetud"
 
@@ -6079,7 +6079,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Märk"
@@ -6702,44 +6702,49 @@ msgstr "Tsiteerimine"
 msgid "Folder name:"
 msgstr "Failinimi"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Värviline silt"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Manus"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Perekonnanimi"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Perekonnanimi"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Aadressiraamat"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Kirja osa pole märgitud."
diff --git a/po/fr.po b/po/fr.po
index 6f1ef802..3638cbb8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -706,7 +706,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1007,7 +1007,7 @@ msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
@@ -1016,7 +1016,7 @@ msgstr "Dossier"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Rechercher :"
 
@@ -1036,7 +1036,7 @@ msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1058,7 +1058,7 @@ msgstr "Rechercher"
 msgid "_Close"
 msgstr "_Quitter"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Modèles enregistrés"
@@ -1072,7 +1072,7 @@ 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:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,37 +1082,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1120,7 +1120,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1128,7 +1128,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1136,7 +1136,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses.\n"
 "Impossible de créer un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1144,15 +1144,15 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1160,78 +1160,78 @@ msgid ""
 "%s%c%s"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Ancien carnet d'adresses converti, mais échec lors de l'écriture du fichier "
 "index"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses. Création d'un nouveau "
 "carnet d'adresses vide."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1243,7 +1243,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Information"
 
@@ -1612,7 +1612,7 @@ msgstr "Le fichier %s n'existe pas\n"
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
@@ -1669,7 +1669,7 @@ msgstr "Vérification des destinataires"
 msgid "Really send this mail to the following addresses?"
 msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
@@ -1681,11 +1681,11 @@ msgstr "Sujet :"
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1693,37 +1693,37 @@ 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:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 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:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Impossible de signer le message."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Impossible de crypter le message."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Impossible de crypter ou signer le message."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1734,11 +1734,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1751,15 +1751,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1773,92 +1773,92 @@ msgstr ""
 "\n"
 "Envoyer quand même ?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Propriétés"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1867,50 +1867,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2398,7 +2398,7 @@ msgstr "Nouveau"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non lu"
 
@@ -5970,7 +5970,7 @@ msgstr "Résultat de la commande"
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Marqué"
 
@@ -6544,41 +6544,46 @@ msgstr "Emplacement :"
 msgid "Folder name:"
 msgstr "Nom du dossier :"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Tous"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Avec coloration"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Avec pièce(s) jointe(s)"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Sur 1 jour"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Sur 5 jours"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Sur 5 jours"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Carnet d'adresses"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Recherche dans les sujets ou expéditeurs"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Pas de message"
diff --git a/po/gl.po b/po/gl.po
index 9dce5cc9..14a571f5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -695,7 +695,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1000,7 +1000,7 @@ msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
@@ -1009,7 +1009,7 @@ msgstr "Carpeta"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
@@ -1030,7 +1030,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1054,7 +1054,7 @@ msgstr "Buscar"
 msgid "_Close"
 msgstr "Pechar"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
@@ -1068,7 +1068,7 @@ msgstr "Borrar enderezo(s)"
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1077,38 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,81 +1158,81 @@ msgid ""
 "%s%c%s"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antiga axenda de enderezos convertida, non se puido gardar o novo ficheiro "
 "índice"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, pero se crearon novos ficheiros "
 "valeiros."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, non se puideron crear os ficheiros "
 "para a nova."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda e non se puideron crear ficheiros "
 "para unha nova."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1244,7 +1244,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1653,7 +1653,7 @@ msgstr "o ficheiro %s non existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tamaño de %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
@@ -1713,7 +1713,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
@@ -1726,11 +1726,11 @@ msgstr "Asunto:"
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1738,40 +1738,40 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1782,12 +1782,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1796,15 +1796,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1813,94 +1813,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Propiedades"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1910,52 +1910,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2449,7 +2449,7 @@ msgstr "Novos"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non leídos"
 
@@ -6080,7 +6080,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -6700,44 +6700,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de cor"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adxunto"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Apelidos"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Apelidos"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Axenda de enderezos"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Non se seleccionou ningunha parte da mensaxe."
diff --git a/po/hr.po b/po/hr.po
index cca3b243..aec9b52e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -702,7 +702,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1005,7 +1005,7 @@ msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Spis"
@@ -1014,7 +1014,7 @@ msgstr "Spis"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
@@ -1035,7 +1035,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1059,7 +1059,7 @@ msgstr "Potraga"
 msgid "_Close"
 msgstr "Zatvori"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
@@ -1073,7 +1073,7 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,38 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,74 +1163,74 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu spremiti index datoteke novih adresa"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu unjeti adresar, kreiram prazne datoteke novog adresara."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu unjeti adresar, ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu unjeti adresar i ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1242,7 +1242,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1661,7 +1661,7 @@ msgstr "Datoteka %s ne postoji\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
@@ -1721,7 +1721,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
@@ -1734,11 +1734,11 @@ msgstr "Tema:"
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1746,40 +1746,40 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1787,12 +1787,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1801,15 +1801,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1818,96 +1818,96 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1917,53 +1917,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2460,7 +2460,7 @@ msgstr "Novo"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -6166,7 +6166,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -6792,44 +6792,49 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Prilog"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adresar"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Nema nepročitanih poruka."
diff --git a/po/hu.po b/po/hu.po
index 4a5988c7..56452640 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2009-08-15 13:25+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -696,7 +696,7 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -998,7 +998,7 @@ msgid "Address book"
 msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappa"
@@ -1007,7 +1007,7 @@ msgstr "Mappa"
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Keresés:"
 
@@ -1027,7 +1027,7 @@ msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1049,7 +1049,7 @@ msgstr "Keresés"
 msgid "_Close"
 msgstr "Be_zárás"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Regisztrált sablonok"
@@ -1063,7 +1063,7 @@ 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:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1072,36 +1072,36 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1109,7 +1109,7 @@ msgstr ""
 "A régi címjegyzék konvertálva,\n"
 "nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "de létrehoztam egy üres új címjegyzéket."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1125,7 +1125,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1133,15 +1133,15 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1149,74 +1149,74 @@ msgid ""
 "%s%c%s"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "A régi címjegyzék konvertálva, nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, de létrehoztam egy új üres címjegyzéket."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Csoport"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1228,7 +1228,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1595,7 +1595,7 @@ msgstr "%s fájl nem létezik\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
@@ -1652,7 +1652,7 @@ msgstr "Címzettek ellenőrzése"
 msgid "Really send this mail to the following addresses?"
 msgstr "Tényleg elküldi ezt a levelet a következő címekre?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
@@ -1664,11 +1664,11 @@ msgstr "Tárgy:"
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1676,39 +1676,39 @@ msgstr ""
 "Nincs megadva fiók a levél küldéshez.\n"
 "Válasszon ki egy fiókot küldés előtt!"
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel %s-n{ae}k küldendő levél küldésekor."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem található hozzárendelt kulcs ehhez a kiválasztott kulcs azonosítóhoz: `%"
 "s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "A levelet nem sikerült aláírni."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "A levelet nem sikerült titkosítani."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "A levelet nem sikerült titkosítani vagy aláírni."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1719,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1759,92 +1759,92 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1853,48 +1853,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "A levél megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2368,7 +2368,7 @@ msgstr "Új"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -5890,7 +5890,7 @@ msgstr "A parancs eredménye"
 msgid "Age"
 msgstr "Kor"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Megjelölt"
 
@@ -6462,41 +6462,46 @@ msgstr "Hely:"
 msgid "Folder name:"
 msgstr "Mappanév:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Minden"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Van színes címkéje"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Van csatolmánya"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "1 napon belüli"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Elmúlt 5 napi"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Elmúlt 5 napi"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Címjegyzék"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Keresés Tárgyra vagy Feladóra"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Nincs levél"
diff --git a/po/it.po b/po/it.po
index b6aaa870..07387e6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -694,7 +694,7 @@ msgstr ""
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Cartella"
@@ -1004,7 +1004,7 @@ msgstr "Cartella"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ricerca:"
 
@@ -1024,7 +1024,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1046,7 +1046,7 @@ msgstr "Cerca"
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
@@ -1060,7 +1060,7 @@ msgstr "Elimina l'indirizzo(i)"
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1070,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1147,78 @@ msgid ""
 "%s%c%s"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Vecchia rubrica convertita, impossibile salvare il nuovo file indice "
 "dell'indirizzo"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, ma ho creato nuovi file vuoti della "
 "rubrica."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica e impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1230,7 +1230,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1597,7 +1597,7 @@ msgstr "Il file %s non esiste\n"
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
@@ -1656,7 +1656,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
@@ -1669,11 +1669,11 @@ msgstr "Oggetto:"
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1681,42 +1681,42 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1728,11 +1728,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1746,15 +1746,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1768,92 +1768,92 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Proprietà"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,48 +1862,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2389,7 +2389,7 @@ msgstr "Nuovi"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non letti"
 
@@ -5943,7 +5943,7 @@ msgstr "Risultato del comando"
 msgid "Age"
 msgstr "Età"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Segnato"
 
@@ -6519,41 +6519,46 @@ msgstr "Posizione:"
 msgid "Folder name:"
 msgstr "Nome della cartella:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Tutto"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Hanno l'etichetta di colore"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Hanno l'allegato"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Entro 1 giorno"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Ultimi 5 giorni"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Ultimi 5 giorni"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Rubrica"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Ricerca per Oggetto o Da"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Non esistono messaggi nuovi."
diff --git a/po/ja.po b/po/ja.po
index c505fd24..e4db5ea6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -689,7 +689,7 @@ msgstr ""
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -990,7 +990,7 @@ msgid "Address book"
 msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "フォルダ"
@@ -999,7 +999,7 @@ msgstr "フォルダ"
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "検索:"
 
@@ -1019,7 +1019,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1041,7 +1041,7 @@ msgstr "検索"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 msgid "Auto-registered address"
 msgstr "自動登録アドレス"
 
@@ -1054,7 +1054,7 @@ msgstr "アドレスの削除"
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,76 +1143,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "グループ"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1224,7 +1224,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "注意"
 
@@ -1591,7 +1591,7 @@ msgstr "ファイル %s は存在しません\n"
 msgid "Can't get file size of %s\n"
 msgstr "ファイル %s のサイズを取得できません\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "ファイル %s は空です。"
@@ -1648,7 +1648,7 @@ msgstr "宛先の確認"
 msgid "Really send this mail to the following addresses?"
 msgstr "このメールを以下のアドレスに送信してもよろしいですか?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "差出人:"
 
@@ -1660,11 +1660,11 @@ msgstr "件名:"
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "送信先のリストを取得できません。"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1672,37 +1672,37 @@ msgstr ""
 "メールを送信するためのアカウントが指定されていません。\n"
 "送信する前にメールアカウントを選択してください。"
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "メッセージを %s にポストする途中にエラーが発生しました。"
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "メッセージを送信控に保存できません。"
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "現在選択されている鍵ID `%s' に対応する鍵が見つかりませんでした。"
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "メッセージに署名できません。"
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "メッセージを暗号化できません。"
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "メッセージを暗号化または署名できません。"
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "ファイルモードを変更できません\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1713,11 +1713,11 @@ msgstr ""
 "\n"
 "%s のままとにかく送信しますか?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "文字コード変換エラー"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1730,15 +1730,15 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "行の長さの制限"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Bcc を伴う暗号化"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1752,92 +1752,92 @@ msgstr ""
 "\n"
 "とにかく送信しますか?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "古いメッセージを削除できません\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "メッセージを送信待ちに入れています...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "送信待ちフォルダが見つかりません\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "メッセージを送信待機できません\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "ファイル %s は存在しません。"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "ファイル %s を開けません。"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成されたメッセージID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "メッセージ作成ウィンドウを作成中...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP署名"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME タイプ"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "サイズ"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "プロパティ"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1846,48 +1846,48 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "ツールバーをカスタマイズ(_C)..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2361,7 +2361,7 @@ msgstr "新着"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "未読"
 
@@ -5869,7 +5869,7 @@ msgstr "コマンドの実行結果"
 msgid "Age"
 msgstr "経過日数"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "マーク付き"
 
@@ -6439,40 +6439,44 @@ msgstr "場所:"
 msgid "Folder name:"
 msgstr "フォルダ名:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "すべて"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "カラーラベル付き"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "添付ファイル付き"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "1日以内"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "最近5日間"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 msgid "Last 7 days"
 msgstr "最近1週間"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+msgid "In addressbook"
+msgstr "アドレス帳にある"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "件名または差出人を検索"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr "%2$d 通中 %1$d 通を表示"
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, c-format
 msgid "No messages matched"
 msgstr "該当するメッセージがありません"
diff --git a/po/ko.po b/po/ko.po
index efffd9f5..803221b2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -686,7 +686,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "폴더"
@@ -1000,7 +1000,7 @@ msgstr "폴더"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
@@ -1021,7 +1021,7 @@ msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1045,7 +1045,7 @@ msgstr "찾기"
 msgid "_Close"
 msgstr "닫기"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
@@ -1059,7 +1059,7 @@ msgstr "주소를 삭제"
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,38 +1068,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,17 +1131,17 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1149,74 +1149,74 @@ msgid ""
 "%s%c%s"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "그룹"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1228,7 +1228,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "알림"
 
@@ -1637,7 +1637,7 @@ msgstr "%s파일이 없습니다\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
@@ -1697,7 +1697,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
@@ -1710,11 +1710,11 @@ msgstr "제목:"
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1722,40 +1722,40 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1765,12 +1765,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1779,15 +1779,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1796,95 +1796,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1894,52 +1894,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2432,7 +2432,7 @@ msgstr "새것"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "안읽음"
 
@@ -6031,7 +6031,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "표시"
@@ -6644,44 +6644,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "파일 이름"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/색 라벨(_b)"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "첨부"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "마지막 이름"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "마지막 이름"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "주소록"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "어떤 메시지 부분도 선택되지 않았습니다."
diff --git a/po/lt.po b/po/lt.po
index 466279db..3aa79557 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -691,7 +691,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -992,7 +992,7 @@ msgid "Address book"
 msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalogas"
@@ -1001,7 +1001,7 @@ msgstr "Katalogas"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ieškoti:"
 
@@ -1021,7 +1021,7 @@ msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1043,7 +1043,7 @@ msgstr "Ieškoti"
 msgid "_Close"
 msgstr "Uždaryti"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
@@ -1057,7 +1057,7 @@ msgstr "Pašalinti adresą(-us)"
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1066,36 +1066,36 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1103,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,15 +1127,15 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,74 +1143,74 @@ msgid ""
 "%s%c%s"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Sena knyga konvertuota, negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, bet sukūriau naujus tuščius adresų knygos "
 "failus."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, negaliu sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos ir sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupė"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1222,7 +1222,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1589,7 +1589,7 @@ msgstr "Failas %s neegzistuoja\n"
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
@@ -1648,7 +1648,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
@@ -1661,11 +1661,11 @@ msgstr "Tema:"
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1673,40 +1673,40 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nerandu rakto susieto su pasirinktu rakto ID „%s“."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1717,11 +1717,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1734,15 +1734,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1751,92 +1751,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Savybės"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1845,48 +1845,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2370,7 +2370,7 @@ msgstr "Nauji"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neskaityti"
 
@@ -5904,7 +5904,7 @@ msgstr "Komandos rezultatas"
 msgid "Age"
 msgstr "Amžius"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Pažymėti"
 
@@ -6480,41 +6480,46 @@ msgstr "Vieta:"
 msgid "Folder name:"
 msgstr "Katalogo vardas:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Visi"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Su spalva"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Su priedu"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr ""
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Pavardė"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adresų knyga"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Ieškoti temos arba sintėjo"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Nėra naujų laiškų."
diff --git a/po/nl.po b/po/nl.po
index a7b58fdc..00189478 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -701,7 +701,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1005,7 +1005,7 @@ msgid "Address book"
 msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Accounts"
@@ -1014,7 +1014,7 @@ msgstr "Accounts"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Zoeken:"
 
@@ -1034,7 +1034,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1058,7 +1058,7 @@ msgstr "Zoeken:"
 msgid "_Close"
 msgstr "Kleuren"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Gebruikte sjablonen"
@@ -1072,7 +1072,7 @@ msgstr "Adres(sen) verwijderen"
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,36 +1082,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1119,7 +1119,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1127,7 +1127,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1135,7 +1135,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1143,17 +1143,17 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1161,79 +1161,79 @@ msgid ""
 "%s%c%s"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Oude adresboekgegevens omgezet. Kon het nieuwe adresboek indexbestand niet "
 "opslaan."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kon adresboekgegevens niet omzetten. Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon ook geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Groep"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,7 +1245,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1616,7 +1616,7 @@ msgstr "Bestand %s bestaat niet\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
@@ -1675,7 +1675,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
@@ -1688,11 +1688,11 @@ msgstr "Onderwerp:"
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1700,40 +1700,40 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,11 +1744,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1761,15 +1761,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1778,92 +1778,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Eigenschappen"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1872,48 +1872,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2403,7 +2403,7 @@ msgstr "Nieuw"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ongelezen"
 
@@ -5992,7 +5992,7 @@ msgstr "Resultaat van opdracht"
 msgid "Age"
 msgstr "Leeftijd"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Gemarkeerd"
 
@@ -6583,42 +6583,47 @@ msgstr "Locatie:"
 msgid "Folder name:"
 msgstr "mapnaam:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Alles"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Heeft kleurlabel"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Heeft bijlage"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Achternaam"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Achternaam"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adresboek"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Zoeken op onderwerp of afzender"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Geen nieuwe berichten."
diff --git a/po/pl.po b/po/pl.po
index 5ab87f64..20f2e19f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -685,7 +685,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -986,7 +986,7 @@ msgid "Address book"
 msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalog"
@@ -995,7 +995,7 @@ msgstr "Katalog"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
@@ -1016,7 +1016,7 @@ msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1039,7 +1039,7 @@ msgstr " Szukaj "
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zarejestrowane szablony"
@@ -1053,7 +1053,7 @@ msgstr "Usuń adres(y)"
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,78 +1140,78 @@ msgid ""
 "%s%c%s"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Stara książka adresowa została skonwertowana, nie można było zapisać nowego "
 "pliku indeksów adresowych."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej lecz utworzono puste pliki "
 "nowej książki adresowej."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej oraz utworzyć nowych plików "
 "książki adresowej."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej i utworzyć nowych plików "
 "książki adresowej"
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1223,7 +1223,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1591,7 +1591,7 @@ msgstr "Plik %s nie istnieje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
@@ -1648,7 +1648,7 @@ msgstr "Sprawdź odbiorców"
 msgid "Really send this mail to the following addresses?"
 msgstr "Na pewno wysłać tę wiadomość do następujących odbiorców?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
@@ -1660,11 +1660,11 @@ msgstr "Temat:"
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1672,38 +1672,38 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Nie można podpisać wiadomości."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Nie można zaszyfrować wiadomości."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Nie można zaszyfrować lub podpisać wiadomości."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1713,11 +1713,11 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to w %s ?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr ""
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1726,16 +1726,16 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Limit długości linii"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 #, fuzzy
 msgid "Encrypting with Bcc"
 msgstr "Szyfrowanie z odbiorcami ukrytej kopii"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1751,92 +1751,92 @@ msgstr ""
 "\n"
 "Wysłać mimo to?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Właściwości"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1845,48 +1845,48 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Zapisz wiadomość"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmodyfikowana. Zapisać ją w folderze szkiców?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Wstaw"
 
@@ -2370,7 +2370,7 @@ msgstr "Nowy"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
@@ -5945,7 +5945,7 @@ msgstr "Wynik polecenia"
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Zaznacz"
@@ -6547,44 +6547,49 @@ msgstr "Miejsce:"
 msgid "Folder name:"
 msgstr "Nazwa pliku"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 #, fuzzy
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kolor etykiety"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Załącznik"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Ostatnia doba"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Ostatnie 5 dni"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Ostatnie 5 dni"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Książka adresowa"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Przeszukuj pola Temat i Od"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Brak nowych wiadomości"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3c8072f8..88867ea7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2010-01-27 15:41-0200\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -698,7 +698,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -999,7 +999,7 @@ msgid "Address book"
 msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Pasta"
@@ -1008,7 +1008,7 @@ msgstr "Pasta"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Procurar:"
 
@@ -1028,7 +1028,7 @@ msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1050,7 +1050,7 @@ msgstr "Procurar"
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
@@ -1063,7 +1063,7 @@ msgstr "Apagar endereço(s)"
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1072,37 +1072,37 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar arquivos do catálogo de endereços."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1110,7 +1110,7 @@ msgstr ""
 "Catálogo de endereços antigo convertido,\n"
 "não foi possível salvar o arquivo de índice de endereços "
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1118,7 +1118,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "mas arquivos vazios para o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1126,7 +1126,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "não foi possível criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1134,15 +1134,15 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços\n"
 "nem criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1153,78 +1153,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Catálogo de endereços antigo convertido, mas não foi possível salvar o "
 "arquivo de indíce do novo"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, mas arquivos vazios para "
 "o catálogo de endereços foram criados."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços e não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1236,7 +1236,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1603,7 +1603,7 @@ msgstr "O arquivo %s não existe\n"
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
@@ -1660,7 +1660,7 @@ msgstr "Conferir destinatários"
 msgid "Really send this mail to the following addresses?"
 msgstr "Deseja realmente enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
@@ -1672,11 +1672,11 @@ msgstr "Assunto:"
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1684,37 +1684,37 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 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:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Não foi possível assinar a mensagem."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Não foi possível cifrar a mensagem."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Não foi possível assinar ou cifrar a mensagem."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1726,11 +1726,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1743,15 +1743,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1765,92 +1765,92 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Propriedades"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,48 +1859,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2377,7 +2377,7 @@ msgstr "Nova"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Não lido"
 
@@ -5896,7 +5896,7 @@ msgstr "Resultado de comando"
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Marcada"
 
@@ -6468,40 +6468,45 @@ msgstr "Local:"
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Todos"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Possuem cor de identificação"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Possuem anexo"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Último dia"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Últimos 5 dias"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 msgid "Last 7 days"
 msgstr "Últimos 7 dias"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Catálogo de endereços"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Procurar por Assunto ou Remetente"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr "%1$d em %2$d coincidem"
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, c-format
 msgid "No messages matched"
 msgstr "Nenhuma mensagem encontrada"
diff --git a/po/ro.po b/po/ro.po
index af6b2520..4a60605e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2009-12-01 16:54+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -705,7 +705,7 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1018,7 +1018,7 @@ msgid "Address book"
 msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dosar"
@@ -1027,7 +1027,7 @@ msgstr "Dosar"
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Caută:"
 
@@ -1047,7 +1047,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1069,7 +1069,7 @@ msgstr "Caută"
 msgid "_Close"
 msgstr "În_chide"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Șabloane înregistrate"
@@ -1083,7 +1083,7 @@ msgstr "Ștergere adresă (adrese)"
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1092,36 +1092,36 @@ msgstr ""
 "Vreți să ștergeți dosarul ȘI toate adresele din „%s” ?\n"
 "Dacă ștergeți doar dosarul, adresele vor fi mutate în dosarul părinte."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1129,7 +1129,7 @@ msgstr ""
 "Agenda veche a fost convertită, dar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1145,7 +1145,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1153,15 +1153,15 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1169,78 +1169,78 @@ msgid ""
 "%s%c%s"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Agenda veche a fost convertită, iar fișierul index al noii agende nu a putut "
 "fi salvat."
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, dar au fost create fișierele noi de agendă "
 "goală."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, iar fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită și fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupă"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1252,7 +1252,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1624,7 +1624,7 @@ msgstr "Fișierul %s nu există\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
@@ -1681,7 +1681,7 @@ msgstr "Confirmare destinatari"
 msgid "Really send this mail to the following addresses?"
 msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
@@ -1695,11 +1695,11 @@ msgid "_Send"
 msgstr "_Trimite"
 
 # hm ?
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,38 +1707,38 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! dependent de traducerea lui Outbox !!!
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în „Trimise”."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate „%s”."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Nu se poate semna mesajul."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Nu se poate cripta mesajul."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Nu se poate cripta sau semna mesajul."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1750,11 +1750,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1767,15 +1767,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1789,92 +1789,92 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi dosarul de coadă\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Proprietăți"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: „%s”\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1883,49 +1883,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în dosarul Ciorne ?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Închide _fără a salva"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2405,7 +2405,7 @@ msgstr "Nou"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Necitit"
 
@@ -5979,7 +5979,7 @@ msgid "Age"
 msgstr "Vârstă"
 
 # comun și când search și în dropdown-ul din fereastra principală
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Marcat"
 
@@ -6561,43 +6561,49 @@ msgstr "Locație:"
 msgid "Folder name:"
 msgstr "Nume dosar:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Tot"
 
 # hm ?
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Cu etichetă de culoare"
 
 # hm ?
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Cu atașament"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Din ultima zi"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Din ultimele 5 zile"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Din ultimele 5 zile"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+# tooltip peste butonul Agendă
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Agendă"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Caută după câmpul Subiect sau De la"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Nu sunt mesaje"
diff --git a/po/ru.po b/po/ru.po
index ba046deb..be8ef619 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2009-08-10 17:45+0400\n"
 "Last-Translator: Ilya Ponetayev <instenet@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -699,7 +699,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1000,7 +1000,7 @@ msgid "Address book"
 msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
@@ -1009,7 +1009,7 @@ msgstr "Папка"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Поиск:"
 
@@ -1029,7 +1029,7 @@ msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1051,7 +1051,7 @@ msgstr "Поиск"
 msgid "_Close"
 msgstr "Закрыть"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зарегистрированные шаблоны"
@@ -1065,7 +1065,7 @@ msgstr "Удалить адрес(а)"
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,36 +1074,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1111,7 +1111,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1127,7 +1127,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1135,15 +1135,15 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1151,77 +1151,77 @@ msgid ""
 "%s%c%s"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Группа"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1233,7 +1233,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1600,7 +1600,7 @@ msgstr "Файл %s не найден\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
@@ -1657,7 +1657,7 @@ msgstr "Проверить получателей"
 msgid "Really send this mail to the following addresses?"
 msgstr "Отправить сообщения по следующим адресам?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
@@ -1669,11 +1669,11 @@ msgstr "Тема:"
 msgid "_Send"
 msgstr "Отправить"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1681,37 +1681,37 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Невозможно подписать сообщение."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Невозможно зашифровать сообщение."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Невозможно зашифровать или подписать сообщение."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1722,11 +1722,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1739,15 +1739,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1760,92 +1760,92 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не удалось открыть файл."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Свойства"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1855,48 +1855,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Настроить панель инструментов"
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2380,7 +2380,7 @@ msgstr "Новые"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Не прочитано"
 
@@ -5914,7 +5914,7 @@ msgstr "Результат команды"
 msgid "Age"
 msgstr "Возраст сообщения"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Помечено"
 
@@ -6486,41 +6486,46 @@ msgstr "Размещение:"
 msgid "Folder name:"
 msgstr "Имя папки:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Все сообщения"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Выделенные цветом"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "С вложениями"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "1 день"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "Последние 5 дней"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Последние 5 дней"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Адресная книга"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Поиск по теме или отправителю"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Нет новых сообщений."
diff --git a/po/sk.po b/po/sk.po
index 4a79aa89..9201ed66 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -691,7 +691,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -998,7 +998,7 @@ msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Priečinok"
@@ -1007,7 +1007,7 @@ msgstr "Priečinok"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
@@ -1028,7 +1028,7 @@ msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1052,7 +1052,7 @@ msgstr "Hľadať"
 msgid "_Close"
 msgstr "Zavrieť"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
@@ -1066,7 +1066,7 @@ msgstr "Zmazať adresu(y)"
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1075,38 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1114,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1138,17 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,81 +1156,81 @@ msgid ""
 "%s%c%s"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Konverzia starého adresára prebehla, nedá sa uložiť indexový súbor nového "
 "adresára"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, ale boli vytvorené prázdne súbory nového "
 "adresára."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár a nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1242,7 +1242,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1650,7 +1650,7 @@ msgstr "Súbor %s neexistuje\n"
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
@@ -1710,7 +1710,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
@@ -1723,11 +1723,11 @@ msgstr "Predmet:"
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,40 +1735,40 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1779,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1793,15 +1793,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1810,94 +1810,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Vlastnosti"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1907,52 +1907,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2447,7 +2447,7 @@ msgstr "Nový"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neprečítané"
 
@@ -6076,7 +6076,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Značka"
@@ -6698,44 +6698,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Názov súboru"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Farebné označenie"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Príloha"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Priezvisko"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Priezvisko"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Otvoriť adresár"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Žiadne nové správy."
diff --git a/po/sl.po b/po/sl.po
index a1d41e61..e90cef50 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -699,7 +699,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1004,7 +1004,7 @@ msgid "Address book"
 msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapa"
@@ -1013,7 +1013,7 @@ msgstr "Mapa"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
@@ -1034,7 +1034,7 @@ msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1058,7 +1058,7 @@ msgstr "Iskanje"
 msgid "_Close"
 msgstr "Zapri"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
@@ -1072,7 +1072,7 @@ msgstr "Brisanje naslova"
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1081,38 +1081,38 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1120,7 +1120,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1128,7 +1128,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1136,7 +1136,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1144,17 +1144,17 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1162,80 +1162,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Star imenik naslovov pretvorjen, ne morem shraniti nove indeksne datoteke "
 "naslovov"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, sem pa naredil prazno datoteko z "
 "imenikom naslovov."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, ne morem narediti novih datotek z "
 "imeniki naslovov."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov in ne morem narediti novih datotek."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1247,7 +1247,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1656,7 +1656,7 @@ msgstr "Datoteka %s ne obstaja\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
@@ -1716,7 +1716,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
@@ -1729,11 +1729,11 @@ msgstr "Zadeva:"
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1741,40 +1741,40 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1784,12 +1784,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1798,15 +1798,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1815,95 +1815,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1913,52 +1913,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2451,7 +2451,7 @@ msgstr "Novo"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neprebrano"
 
@@ -6077,7 +6077,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Označi"
@@ -6698,44 +6698,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Barvanje oz_nak"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priloga"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Priimek"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Priimek"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Imenik naslovov"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Noben del sporočila ni izbran."
diff --git a/po/sr.po b/po/sr.po
index 84f45a97..791381cb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -699,7 +699,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1004,7 +1004,7 @@ msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1013,7 +1013,7 @@ msgstr "Direktorijum"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
@@ -1034,7 +1034,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1058,7 +1058,7 @@ msgstr "Pretraga"
 msgid "_Close"
 msgstr "Zatvori"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
@@ -1072,7 +1072,7 @@ msgstr "Obriši adresu/e"
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,73 +1163,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu napraviti index datoteke novih adresa"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1241,7 +1241,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1650,7 +1650,7 @@ msgstr "Datoteka %s ne postoji\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
@@ -1710,7 +1710,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
@@ -1723,11 +1723,11 @@ msgstr "Tema:"
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1735,41 +1735,41 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, 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:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1779,12 +1779,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1793,15 +1793,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1810,95 +1810,95 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1908,52 +1908,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2446,7 +2446,7 @@ msgstr "Novo"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -6071,7 +6071,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -6693,44 +6693,49 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Dodatak"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adresar"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Nijedan deo poruke nije odabran."
diff --git a/po/sv.po b/po/sv.po
index acf22847..e0cde692 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -696,7 +696,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1001,7 +1001,7 @@ msgid "Address book"
 msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapp"
@@ -1010,7 +1010,7 @@ msgstr "Mapp"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
@@ -1031,7 +1031,7 @@ msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1055,7 +1055,7 @@ msgstr "Sök"
 msgid "_Close"
 msgstr "Stäng"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
@@ -1069,7 +1069,7 @@ msgstr "Ta bort adress(er)"
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,36 +1079,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1158,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok, men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Kunde inte konvertera adressbok, kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1238,7 +1238,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Notera"
 
@@ -1614,7 +1614,7 @@ msgstr "Filen %s finns inte\n"
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
@@ -1673,7 +1673,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
@@ -1686,11 +1686,11 @@ msgstr "Ämne:"
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1698,41 +1698,41 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1743,11 +1743,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1760,15 +1760,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1777,92 +1777,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Egenskaper"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1872,48 +1872,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2402,7 +2402,7 @@ msgstr "Nya"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Olästa"
 
@@ -5974,7 +5974,7 @@ msgstr "Resultat av kommando"
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "Markering"
@@ -6572,44 +6572,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Filnamn"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/F_ärgmarkera"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bilaga"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Efternamn"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Efternamn"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adressbok"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Inga nya meddelanden."
diff --git a/po/tr.po b/po/tr.po
index aa2c9dd3..9c437547 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+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"
@@ -694,7 +694,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -1001,7 +1001,7 @@ msgid "Address book"
 msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dizin"
@@ -1010,7 +1010,7 @@ msgstr "Dizin"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
@@ -1031,7 +1031,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1055,7 +1055,7 @@ msgstr "Ara"
 msgid "_Close"
 msgstr "Kapat"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Kayıtlı şablonlar"
@@ -1069,7 +1069,7 @@ msgstr "Adres(ler)i sil"
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,38 +1079,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1118,7 +1118,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1126,7 +1126,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1134,7 +1134,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1142,17 +1142,17 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1160,78 +1160,78 @@ msgid ""
 "%s%c%s"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Eski adres defteri çevrildi, ancak yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Adres defteri çevrilemedi, ancak yeni ve boş bir adres defteri dosyası "
 "oluşturuldu."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Grup"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1243,7 +1243,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Not"
 
@@ -1643,7 +1643,7 @@ msgstr "%s dosyası bulunamadı\n"
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
@@ -1703,7 +1703,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
@@ -1716,11 +1716,11 @@ msgstr "Konu:"
 msgid "_Send"
 msgstr "Gönder"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1728,40 +1728,40 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, 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:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1772,12 +1772,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1786,15 +1786,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1803,94 +1803,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "işaretli dosya açılamadı.\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Özellikler"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, 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:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1900,52 +1900,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2437,7 +2437,7 @@ msgstr "Yeni"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Okunmamış"
 
@@ -6044,7 +6044,7 @@ msgstr "Komut sonucu"
 msgid "Age"
 msgstr "Yaş"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "İşaretle"
@@ -6643,44 +6643,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Dosya adı"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Renk etiketi"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "Ek"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Soyadı"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Soyadı"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Adres defteri"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Yeni ileti yok."
diff --git a/po/uk.po b/po/uk.po
index 472f73e2..52a66498 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0svn2431\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2010-01-14 22:30+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -696,7 +696,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -997,7 +997,7 @@ msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
@@ -1006,7 +1006,7 @@ msgstr "Папка"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
@@ -1026,7 +1026,7 @@ msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1048,7 +1048,7 @@ msgstr "Пошук"
 msgid "_Close"
 msgstr "Закрити"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зареєстровані шаблони"
@@ -1062,7 +1062,7 @@ msgstr "Видалити адресу(и)"
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1071,36 +1071,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1108,7 +1108,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1132,15 +1132,15 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1151,71 +1151,71 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1227,7 +1227,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1594,7 +1594,7 @@ msgstr "Файл %s не існує\n"
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
@@ -1651,7 +1651,7 @@ msgstr "Перевірити отримувачів"
 msgid "Really send this mail to the following addresses?"
 msgstr "Дійсно послати цю пошту на наступні адреси?"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
@@ -1663,11 +1663,11 @@ msgstr "Тема:"
 msgid "_Send"
 msgstr "Послати"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1675,37 +1675,37 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 msgid "Can't sign the message."
 msgstr "Не вдалось підписати лист."
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 msgid "Can't encrypt the message."
 msgstr "Не вдалось зашифрувати лист."
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 msgid "Can't encrypt or sign the message."
 msgstr "Не вдалось зашифрувати чи підписати лист."
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1716,11 +1716,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1733,15 +1733,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1755,92 +1755,92 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалось відкрити файл %s."
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Властивості"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,48 +1849,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2364,7 +2364,7 @@ msgstr "Нові"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Непрочитані"
 
@@ -5873,7 +5873,7 @@ msgstr "Результат команди"
 msgid "Age"
 msgstr "Давність"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Відзначені"
 
@@ -6445,40 +6445,45 @@ msgstr "Розташування:"
 msgid "Folder name:"
 msgstr "Ім'я папки:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Всі"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Мають кольорову позначку"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Мають вкладення"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr "Протягом одного дня"
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 msgid "Last 5 days"
 msgstr "За останні 5 днів"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 msgid "Last 7 days"
 msgstr "За останні 7 днів"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Адресна книга"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Пошук за полем `Тема' або `Від'"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr "%1$d відповідних з %2$d"
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, c-format
 msgid "No messages matched"
 msgstr "Немає відповідних листів"
diff --git a/po/vi.po b/po/vi.po
index 3c19c9ee..70234e57 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -678,7 +678,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -982,7 +982,7 @@ msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Thư mục"
@@ -991,7 +991,7 @@ msgstr "Thư mục"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
@@ -1011,7 +1011,7 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1035,7 +1035,7 @@ msgstr "Tìm kiếm:"
 msgid "_Close"
 msgstr "Màu sắc"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
@@ -1049,7 +1049,7 @@ msgstr "Xoá địa chỉ"
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1058,36 +1058,36 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "Người dùng mới, không thể lưu tập tin mục lục."
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "Người dùng mới, không thể lưu các tập tin sổ địa chỉ."
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1095,7 +1095,7 @@ msgstr ""
 "Sổ địa chỉ cũ đã được chuyển,\n"
 "không thể lưu tập tin địa chỉ mới"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1103,7 +1103,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "nhưng đã tạo các tập tin sổ địa chỉ trống mới."
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1119,17 +1119,17 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ\n"
 "và không thể các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1137,78 +1137,78 @@ msgid ""
 "%s%c%s"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Sổ địa chỉ cũ đã được chuyển đổi, không thể lưu tập tin mục lục địa chỉ mới"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, nhưng đã tạo các tập tin sổ địa chỉ trống "
 "mới."
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ và không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1220,7 +1220,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1591,7 +1591,7 @@ msgstr "Tập tin %s không tồn tại\n"
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
@@ -1650,7 +1650,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
@@ -1663,11 +1663,11 @@ msgstr "Tiêu đề:"
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1675,40 +1675,40 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "Không thể lưu thư vào hộp gửi (outbox)."
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Không tìm thấy khoá liên quan đến khoá đang chọn với id `%s'."
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1719,11 +1719,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1736,15 +1736,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1753,92 +1753,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "Thuộc tính"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1847,48 +1847,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2376,7 +2376,7 @@ msgstr "Mới"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "Chưa đọc"
 
@@ -5945,7 +5945,7 @@ msgstr "Kết quả của lệnh"
 msgid "Age"
 msgstr "Tuổi"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 msgid "Marked"
 msgstr "Đã đánh dấu"
 
@@ -6532,42 +6532,47 @@ msgstr "Địa điểm:"
 msgid "Folder name:"
 msgstr "Tên thư mục:"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr "Tất cả"
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 msgid "Have color label"
 msgstr "Có nhãn màu"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 msgid "Have attachment"
 msgstr "Có đính kèm"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Họ"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "Họ"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "Sổ địa chỉ"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr "Tìm theo tiêu đề hoặc người gửi"
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "Không có thư mới."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a921e5ab..9ba6d015 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -688,7 +688,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "文件夹"
@@ -1004,7 +1004,7 @@ msgstr "文件夹"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
@@ -1025,7 +1025,7 @@ msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1049,7 +1049,7 @@ msgstr "搜索"
 msgid "_Close"
 msgstr "关闭"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已注册的规则"
@@ -1063,7 +1063,7 @@ msgstr "删除地址"
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1072,38 +1072,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1111,7 +1111,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1127,23 +1127,23 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1151,73 +1151,73 @@ msgid ""
 "%s%c%s"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1229,7 +1229,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "注意"
 
@@ -1608,7 +1608,7 @@ msgstr "文件 %s 不存在\n"
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
@@ -1668,7 +1668,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
@@ -1681,11 +1681,11 @@ msgstr "标题："
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1693,40 +1693,40 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,94 +1767,94 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "属性"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1864,51 +1864,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2399,7 +2399,7 @@ msgstr "新建"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "未读"
 
@@ -5976,7 +5976,7 @@ msgstr "命令结果"
 msgid "Age"
 msgstr "邮件时间"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "标记"
@@ -6575,44 +6575,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "文件名"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/颜色标签(_B)"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "附件"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "姓氏"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "姓氏"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "地址簿"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "没有选择邮件部分。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 20992b9d..f7b7c583 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 18:50+0900\n"
+"POT-Creation-Date: 2010-02-12 14:33+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -693,7 +693,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:374 src/addressadd.c:178 src/addressbook.c:683
-#: src/compose.c:5258 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5241 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -998,7 +998,7 @@ msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3771 src/folderview.c:385
+#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
@@ -1007,7 +1007,7 @@ msgstr "資料夾"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:751 src/quick_search.c:124
+#: src/addressbook.c:751 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
@@ -1028,7 +1028,7 @@ msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1893 src/editaddress.c:719
+#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
@@ -1052,7 +1052,7 @@ msgstr "尋找"
 msgid "_Close"
 msgstr "顏色"
 
-#: src/addressbook.c:950 src/addressbook.c:3078
+#: src/addressbook.c:950 src/addressbook.c:3082
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已紀錄之郵件樣板符號"
@@ -1066,7 +1066,7 @@ msgstr "刪除通訊紀錄"
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1884
+#: src/addressbook.c:1885
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1075,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1887 src/folderview.c:2546
+#: src/addressbook.c:1888 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1887
+#: src/addressbook.c:1888
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1892
+#: src/addressbook.c:1893
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2824 src/addressbook.c:2962
+#: src/addressbook.c:2828 src/addressbook.c:2966
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:2832 src/addressbook.c:2970
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2838 src/addressbook.c:2976
+#: src/addressbook.c:2842 src/addressbook.c:2980
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2843
+#: src/addressbook.c:2847
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1114,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2856
+#: src/addressbook.c:2860
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2862
+#: src/addressbook.c:2866
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2867
+#: src/addressbook.c:2871
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1138,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2874
+#: src/addressbook.c:2878
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:2882
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2917
+#: src/addressbook.c:2921
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,73 +1156,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2920
+#: src/addressbook.c:2924
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2985
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:2999
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3005
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3007
+#: src/addressbook.c:3011
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3019
+#: src/addressbook.c:3023
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3025
+#: src/addressbook.c:3029
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3031
+#: src/addressbook.c:3035
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3701 src/prefs_common_dialog.c:2343
+#: src/addressbook.c:3706 src/prefs_common_dialog.c:2343
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3715 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3729
+#: src/addressbook.c:3734
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3743
+#: src/addressbook.c:3748
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3757
+#: src/addressbook.c:3762
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:3785
+#: src/addressbook.c:3790
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3799 src/addressbook.c:3813
+#: src/addressbook.c:3804 src/addressbook.c:3818
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3827
+#: src/addressbook.c:3832
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1234,7 +1234,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6590 src/main.c:751
+#: src/alertpanel.c:142 src/compose.c:6573 src/main.c:751
 msgid "Notice"
 msgstr "注意"
 
@@ -1610,7 +1610,7 @@ msgstr "檔案 %s 不存在\n"
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2212 src/compose.c:4343
+#: src/compose.c:2212 src/compose.c:4326
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
@@ -1669,7 +1669,7 @@ msgstr ""
 msgid "Really send this mail to the following addresses?"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/compose.c:3167 src/compose.c:5124 src/headerview.c:54
+#: src/compose.c:3167 src/compose.c:5107 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
@@ -1682,11 +1682,11 @@ msgstr "主旨："
 msgid "_Send"
 msgstr "送出"
 
-#: src/compose.c:3427
+#: src/compose.c:3410
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:3447
+#: src/compose.c:3430
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1694,40 +1694,40 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3461 src/send_message.c:315
+#: src/compose.c:3444 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3511
+#: src/compose.c:3494
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:3554
+#: src/compose.c:3537
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3581 src/compose.c:3966
+#: src/compose.c:3564 src/compose.c:3949
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3608 src/compose.c:4009
+#: src/compose.c:3591 src/compose.c:3992
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3643 src/compose.c:4004
+#: src/compose.c:3626 src/compose.c:3987
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:3689 src/compose.c:4037 src/compose.c:4100 src/compose.c:4220
+#: src/compose.c:3672 src/compose.c:4020 src/compose.c:4083 src/compose.c:4203
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3722
+#: src/compose.c:3705
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1737,11 +1737,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3728
+#: src/compose.c:3711
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3814
+#: src/compose.c:3797
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1754,15 +1754,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3818
+#: src/compose.c:3801
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3984
+#: src/compose.c:3967
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3985
+#: src/compose.c:3968
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1771,92 +1771,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4180
+#: src/compose.c:4163
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4198
+#: src/compose.c:4181
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:4286
+#: src/compose.c:4269
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:4293
+#: src/compose.c:4276
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4338
+#: src/compose.c:4321
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:4347
+#: src/compose.c:4330
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟標記的檔案。\n"
 
-#: src/compose.c:4956
+#: src/compose.c:4939
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:5071
+#: src/compose.c:5054
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:5198
+#: src/compose.c:5181
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:5201
+#: src/compose.c:5184
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5239 src/compose.c:6409
+#: src/compose.c:5222 src/compose.c:6392
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:5248 src/mimeview.c:217 src/prefs_filter_edit.c:507
+#: src/compose.c:5231 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5164
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6304
+#: src/compose.c:6287
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6322
+#: src/compose.c:6305
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6391
+#: src/compose.c:6374
 msgid "Properties"
 msgstr "內容"
 
 #. Encoding
-#: src/compose.c:6411 src/prefs_common_dialog.c:1009
+#: src/compose.c:6394 src/prefs_common_dialog.c:1009
 #: src/prefs_common_dialog.c:1670
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6434 src/prefs_folder_item.c:202
+#: src/compose.c:6417 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6435
+#: src/compose.c:6418
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6525
+#: src/compose.c:6508
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6587
+#: src/compose.c:6570
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1866,48 +1866,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6924 src/mainwindow.c:3022
+#: src/compose.c:6907 src/mainwindow.c:3022
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7044 src/compose.c:7049 src/compose.c:7055
+#: src/compose.c:7027 src/compose.c:7032 src/compose.c:7038
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:7146
+#: src/compose.c:7129
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:7169 src/inputdialog.c:372
+#: src/compose.c:7152 src/inputdialog.c:372
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:7220
+#: src/compose.c:7203
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:7221
+#: src/compose.c:7204
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:7223 src/compose.c:7227
+#: src/compose.c:7206 src/compose.c:7210
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7274
+#: src/compose.c:7257
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:7276
+#: src/compose.c:7259
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7277
+#: src/compose.c:7260
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2396,7 +2396,7 @@ msgstr "新的"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1585
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
-#: src/quick_search.c:108
+#: src/quick_search.c:110
 msgid "Unread"
 msgstr "未讀的"
 
@@ -5944,7 +5944,7 @@ msgstr "執行結果"
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:512 src/quick_search.c:109
+#: src/prefs_filter_edit.c:512 src/quick_search.c:111
 #, fuzzy
 msgid "Marked"
 msgstr "標記"
@@ -6541,44 +6541,49 @@ msgstr ""
 msgid "Folder name:"
 msgstr "檔名"
 
-#: src/quick_search.c:107
+#: src/quick_search.c:109
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:110
+#: src/quick_search.c:112
 #, fuzzy
 msgid "Have color label"
 msgstr "/以顏色做標記(_B)"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:113
 #, fuzzy
 msgid "Have attachment"
 msgstr "附加檔案"
 
-#: src/quick_search.c:113
+#: src/quick_search.c:115
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:114
+#: src/quick_search.c:116
 #, fuzzy
 msgid "Last 5 days"
 msgstr "姓"
 
-#: src/quick_search.c:115
+#: src/quick_search.c:117
 #, fuzzy
 msgid "Last 7 days"
 msgstr "姓"
 
-#: src/quick_search.c:146 src/quick_search.c:355
+#: src/quick_search.c:119
+#, fuzzy
+msgid "In addressbook"
+msgstr "通訊錄"
+
+#: src/quick_search.c:150 src/quick_search.c:378
 msgid "Search for Subject or From"
 msgstr ""
 
-#: src/quick_search.c:310
+#: src/quick_search.c:333
 #, c-format
 msgid "%1$d in %2$d matched"
 msgstr ""
 
-#: src/quick_search.c:313
+#: src/quick_search.c:336
 #, fuzzy, c-format
 msgid "No messages matched"
 msgstr "沒有新郵件。"